merge functional tests