Cleaned up all tests