clean up tests and add layout link tests