refactor url stuff for simplicity
refactor url, get rid of unnecessary comment.
fix test count.  I know that since this is an integration test, the could isn't cool, but it's just for show.
blah