Resolve H201 and H202

* H201 - 'except:' at least use 'except Exception:
* H202 - H202 assertRaises Exception too broad

Change-Id: I26ab6d9ca2cbe9080235135e98200f219235e0c8