Fixed tests to account for error messages now being passed in