Minor adjustment to functional tests