Adding test classes for all entities, trying 2nd time