functional test tweaks