Change default test server generator, remove test code