[cleanup] fix invalid tests
swap method
[cleanup] clarify test names
merge from aztecrex/integrate