Add another test/update toString.
Fix some missed generic defs.