Prepare tests for jetty 9