Merge "Update Cinder test that incorrectly handles 404"