minor tweaks to functional tests