added link tests and cleaned up some tests