Cleaned up some test code by removing unneeded tests.