Cleaned up/deleted tests and created new tests