Reorder, fixes to Link implementation

Also started a new, more structured, test setup.