Fixed and improved tests for jaxrs client and singleton due to TomEE failures.