New jettywrapper + new testdata