Updated to latest tests
Tools directory