Uncommented tests in WS test suite (it was included incorrectly in some commit)
AS: POM refactoring
Fixes for CDI tests (mac & win)