Improve error handling in test