Clean up failure
Adjust tests to match new behaviour