Changes to make tests run on older versions of dependencies

Cf: #174 and #175