iterator -> entries, fixed tests