Fixed failing arquillian tests