Fixed some bugs and added new unit tests to JettyServices.