Cleaned up tests some more.