Large amount of unit test code duplication reduction
Allow SimpleSchedulerInterface to shutdown created schedulers...this matches the pattern in the previous commit, and also reduces code duplication
Prevent having to pass in two factories that are basically the same thing
Just let this factory implement both interfaces, no need for a second inner class
More unit test code duplication reduction
Removed unused imports
Implemented this last TODO note on duplicated code reduction for these unit tests
Merge branch 'master' into unstable_staging