minor tweak to functional tests to prevent deadlocks