Updated tests to use same jetty instance