Brock

I think we should have at least basic test coverage for everything except the routes directory.