Fix broken test after g-d-m changes