Small tweaks to the test