fixed tests to work with new error handling