fix tests according to new constructors
Merge branch 'master' into openstack_zones