Replace (old) raises test helper with expect_raises Fixes #350 Change-Id: I154ffeecad925622167593b6a5a45458eaf95641