minor bug fix in functional tests to compensate for recent merge