Fixed bugs in TestTune/TestTune2 and GenSamples; added some test data