Merge XTS JUnit and Arquillian tests (4.17)