Change test command to send two tests (and fix more bugs tp get there).