Interfaces Entity and Entities.
Cleans up Assertions in test source