fix tests after upgrading to g-d-m 4.0.0.BUILD-SNAPSHOT