Fixes on functional tests, added new SFX