fix functional test errors introduced at 00c94da