Fix API tests
Fix API tests

The patch fixes some of the broken tests.

Change-Id: I605268e255b58d994cdc98766562b408d94f0115

openstack/poppy,openstack/poppy,obulpathi/poppy,stackforge/poppy,obulpathi/poppy,obulpathi/poppy,stackforge/poppy,openstack/poppy,stackforge/poppy