Last tests for Entity Class
Entity class refactored.