Merge "Remove created routers as part of test cleanup"