Minor tweaks to the tests