Updated the unit tests so that they will pass
Merge branch 'updated_tests'