Merge "Additional work on procfs tests"