Refactoring for test models

Moving to the prefferred syntaxes for validates and also replacing lambda with -> symbol