More functional test tweaks