WIP : fixing functional test