Cleaned up some tests and removed others