Apply decorated JSON to PUTs, fix some tests, merge with Julian's Changes