added validations
finished model testing
Merge branch 'testing' into development