* adapted entity classes to fit to SimpleTest