Improved ParseToolsTest
A few more bugfixes
Fixed another bug