Fixed arquillian tests