#125 test cleanup