Better test output.
Support labels and type parameters.
Update golden with new class structure.
Update the test.
Also gather type paramter definitions.