Some streamlining and add test to ensure config model insert fields

are set from options when creating a new Client instance