Cleaning up unused tests. All remaining tests pass