Upgrade Jetty 9 and clean tests