Update generated test suite to new templates