Merge "Replace try/except/else with self.assertRaises."