add jetty container for integration tests.  + minor test case
refactoring