Fixes for test_model in py3

Change-Id: Ie7f1055b2a1852cc4bd9c635ea68ec577ab8adaa
1 file changed