Started updating tests to new link system