more cleanup and fixes ... tests running cleanly now.
A bit more cleanup with route direction stuff...