added non triggered tests. corrected bugs