refactored tests and added new validations
Merge branch 'master' of https://github.com/encorelab/paingain