All tests now pass using TestServer2.jar