moved code to correct file, added more tsets.