Complete spec tests for router

Edited by Mark Harding