#74 test cleanup