Fix subtle filesystem bug.
Cleanup filesystem code a bit.
Resolve conflicting fixture name.