Updated error message, and test output checks