Cleaned up a few tests
Cleaned up a few tests