PEP8 fixups and locally scoped 'assert_equal'