Fixes from tempest tests run

Change-Id: I903e986533e9f6f807840c5ef25191d1aec82c50