Small tweaks to the tests that are run