Add some tests
Merge branch 'mesuretool'