XXX use effective / expiration date consistently

(it seems behavior of domain tool and CompositionMixin._getEffectiveModel
is not consistent, let's try tests)