less garbage in lock and test data