Layout changes. Add link path tests