Updated test generation.