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

Some tests are still failing, but they fail in master already