Jax RS support. Fix unit tests