~dricottone/gap

ref: 37a014fedc014cb926fcf525d9e7626c2151ecf7 gap/tests d---------