Extend EntitySpec with more validation