Fix format syntax to be Python 2.6 compatable
Fix use of unittest.TestCase.assertRaises as context manager...

because it's not supported out the box in Python 2.6. Boo.