Fixed association issues for the test generator