updated tools & tests