Openstack test fixes