for the sake of keeping this PR to focus on improvements to how we test, let's keep these little changes in a separate PR. :)