Clean up test a little.