Completed test coverage of branches for existing classes, and fixed problems with SimpleRoutes.