#74 test cleanup (2)