I updated the tests to avoid creating so many extra objects.