Updated tests to match changes to error handling and requirements