Fixed Arquillian tests