Adding unit tests for the recently added functionality (and even improved on unit test for old functionality).  This also fixes some check style warnings, as well as an issue of removing the task from a scheduled task that was provided to a limiter.