fixed reset password function
added unit tests for Definition creation
Merge branch 'model' into dev