Debugging improvements, adding bad case