Merge "Cleanup unittests for test_lmbench"