fix typo
Add tests for the --pivot option
Add more --pivot tests
Merge commit '56cf72ed0a7cdf134d1046559582a4a11fbfdedc'