Uncomment unit test teardown
Preserve contents of ROUTES (Enhancement #723)
Reverse commit 344e297