Rejigging... also adding tests
removing old named router