Fixed ordering related test failure

Also PEP8 + python_2_unicode_compatible cleanup done.