Add jpa creation helpers
Fix WS tests