Cleaned up some old tests.