Fix tests.

Need to perhaps make this less fragile. Blah.