Some minor tweaks to tests