Use more rigorously underscored nested collection for new test.
Use more rigorously underscored nested collection for new test.

Plus refactoring around same

pyinvoke/invoke,pyinvoke/invoke,mkusz/invoke,mkusz/invoke