Minor refactoring and test route verification.