Fixed a pair of poorly-named tests.
Fixed some fragile waiting in a test.