Fixed testing bug
Merge branch 'tools'