Updating more functional tests