Adding host router and tests, consistent naming