Merge functional tests to dev