Arquillian upgrade