shuffle method calls for test
Revert "shuffle method calls for test"

This reverts commit d71ea8941cee2f282abe1ea476603b9a2be03e1d.