Enhanced error modes
Keep tests clean