Cleaned up the tests more.