Revert "Disable certain tests for pwd module, split up patch files."

This reverts commit 169c717f4ecec5813c2b4434fef21865dcd5f432.
Re-add pwd fix.