Raise coverage

Added some tests, up to about 98% w/ this branch.  I also made some changes to the routes file.  Take a look when you get a chance.