Added Jetty libs
Fixed bugs, added more tests.