subcategory updates to mocha tests, router init still not being passed to main