Tests arquillian
Merge remote-tracking branch 'origin/tests-arquillian' into tests-arquillian-local