Correct validations for app model
Correct test to work with new portal