Added in the first route and fixed up some tests