Cleaned up the new tests