A few more metalink updates
More metalink work, plus a test case