Rebase the failing test onto latest

Fixes #3

Looks like it was a test issue after all, perhaps related to timings.