Refactored for EJB Arquillian tests