Add default measures if modules don't provide one.
Fix tests.