Added link intercept to test, added var in a couple places