Updated test generators