some small test generation code changes