Refactored to use AssertionHelper
Refined generator tests