small changes in test generator