Editing fn:collection for json and testing
15 files changed