First shot.

TODO: Can we replicate the problem where the first test
case gets dropped?