some test refactoring, new entities test added