Cleaned up unused tests