agreed, but as a separate PR later. I don't want to change the tests themselves in this one, as it would be a pain to follow changes