swap method
[cleanup] clarify test names