WIP: fixing functional test