Test generator updated to v2.0