Fix broken test

* "diameter" tag no longer exists
* Add safety code so PyCharm can run our tests
Merge branch 'master' of https://github.com/azavea/OTM2