Change the tests per your suggestions.  Yeah I think it's much better checking the urls.  I also left in the mapping check and made it python 3 compatible.  Let me know if there is anything else, I can do.