Improve sad path testing