Moved to Jetty for test server