~dricottone/gap

ref: 916e157d8bc0c1d0379b3154c57d27aeea955a04 gap/tests d---------