Fix tools tests

Merged Matthias Clasen requested to merge fix-tools-tests into master

Merge request reports