Switching to my new code, it seems to work on all my tests