Fix for unit test failures with recurring tasks