Added test generators