TST fix broken tests (which were using fancy asserts, broke travis py2.6 and py3)
Merge pull request #3200 from hayd/fancy_asserts

TST fix broken tests (which were using fancy asserts, broke travis py2.6...