Fixed assertRaises calls