Add tests for layout links and clean up existing specs