Fix tests.
Clean up a bit.