Ongoing: Test and App refactoring, adding model validations