Fixing brittle tests [exposed by 0c2655b15605]
No longer using assertIsinstance (is 2.7+ only)
unnitest.assertIn isn't available in Python 2.6