Make this test work regardless of order interfaces are returned in
Merge branch 'master' into hhvm