Clean up unit tests a little.