Minor fixes
Better tests for router