Refactoring: Test models with the syntax change for validates

also change in lambda syntaxes at some instance