bugfix: more doubly-defined link types.
More fixes for the atom types crisis

Gahh. Cleaning up yet another mess that popped out of the woodwork.
Why am I the janitor for all the trash around here? Can't you guys
clean up after yourselfves?  Arghhhh.
Port the test over from old API
Fix broken UTest, due to types breakage