Merge "Set more fields in fake DB subclasses to avoid errors"