test changes

changes in generation of test data
some changes