~dricottone/gap

ref: 8cc67801dc1f2240fdaa60861fcd859b9792b68a gap/tests d---------