Add some tools
Merge branch 'master' into subtreeable
Remove tests