Small tweaks to the Tests