Faster UnitTestAnalyser
Fixed failing test