Correct errors with test suite