added controller tests, modified routes a bit to accomodate tests.  One of the tests is still failing.