Refactored tests and check links.