Attempted fix for https://github.com/pytest-dev/pytest/issues/2836

Improves the handling of "nodeid"s to be more aware of path and class separators.