Updating tests to work with jetty deployment (some tests still failing)