fixed some generation of test data. Still more to do