functional tests corrected