Revert the test changes that I made earlier to get feedback.