Changed PHPUnit references.  Added new tests for router.