moving to common location
adding error messages to test cases
Merge branch 'unittest'