note: I also changed this test, in addition to the follow-up