Fixed broken test tools scripts
Merge branch 'fix_testing'