Simplify tests with Normann's recommendations
Upgrade to Jetty 9