Updated tools tests