Test cases.

- more test-cases in collate_test.go
- updated tool/* as per latest changes to collatejson library.