New entity classes and test class