more fixes to functional test