Update tests
Tweak JsonAttributes