Implemented EntityValidator + tests