Bugfix: fix tests for Measurement to use new "Generic" models.
Merge branch 'master' of https://github.com/catami/catami