functional tests fixed