Refactoring

Add test around measures