Illustrate bug
Improve test-tools
Update
Begin cleaning
Merge branch 'cleaning'