more repl v3 test cleanup