More error handling in the integration tests