Feature/fix functional tests