Reenabling some tests

By removing a race condition.  Whoops!

This includes a commit that's in #28