Fixed failing tests
Merge pull request #127 from ojwanganto/MCHS-tests-errors

Fixed failing mchs tests