Correction for previous preserving default PR

it seems I miscalculated where to put the defaults clone in my previous commit. This corrects it by moving the `__clone` call from `formatScheme` to `buildScheme`.

Also added a test for this.