This makes it easier to update the test checks and also adds better coverage.
mentioned in commit 7f8dee5c