Fix failing tests. Add sfx function, add NullJobTask