Fix build, correct bug.

I missed the tests when I was working on this last, Travis showed a
build failure at my pull request. This should resolve the issues -- the
test modules didn't parameterize some necessary values, and there was an
uri calculation bug.