cleaned up some tests.