Add custom matcher to DRY up end_square specs