improved generation testing