Lots of new Tests + refactor json manipulation on changeset.