fix: call measure
add: more tests, improving coverage to 84 %