use assertIsInstance()
removed unittest2 (we are on python 2.7 anyway)
whitespace, indentation, light cleanup