Better testing for AutoMap; ensure we handle defaults properly.