refactoring
Merge branch 'tests-arquillian' into dev