AS7-5940 Tweak transfomers, fix parsing/model storage/marshalling, add tests