Issue #1: Addressed duplicate router and loader additions, and cleaned up all of the tests to handle that, and other recent changes.