Added new classes to build arquillian tests