I would still prefer to have this in a separate test.