better default routing, initial unit test harness