A bit of refactoring and cleanup
More Router tests