add some pytest collect related tests + some refinements. --HG-- branch : trunk
- move and merge _py/ bits back to py/ - fixes all around --HG-- branch : trunk