Merge "Update api tests from tempest"