Refactoring
Entity with validate test
Entity with test