Adding default values in subclass cause default values from superclass to not be saved

I don't have a fix for this yet, but I wanted to get up the failing test case for this issue while I investigate a proper fix.