Fix cinder unittest for c14f84190d changeset