Refactor router controller unit tests
Merge pull request #480 from pmorie/router

Merged by openshift-bot