Streamlined tests and added test for page links