Arquillian test improvement

Still fails