Add more --pivot tests