Minor fiddle to functional tests