Reverted deleted test and modified ensure subdirs are ignored.