Fix up cinder support tests

Change-Id: I947bb9f2ea1dc15958eeee5709803096b44b5c26