These are now passing

But I'm still not entirely happy