..
refactor functional tests