small updates for the functional tests