Fixed broken test tools scripts