Move test server to new class and cleanup test