minor changes in functional tests