Update to F and T tests; Plots