Minor tweaks

Fix an omission on inline generation

Enhanced unit tests a bit. Note that this is clearly NOT the way to do MissingRequiredField overrides if you have to restore to the default