Add measures and tests.