WIP: Passing and fixing archive link tests