Removed unused tests
Cleaned up some tests