Update code to comply with hacking 0.8.0

Replace assertEquals and assertNotEquals with assertEqual and
assertNotEqual (new rule, H234), and fix indentation.

Change-Id: I86177325dee3aa00af5df8b3085acd478994ee34