Commit 52e9120c777fba582a468323d2b94155a071f5ea

The rugged tests are fragile 2014-09-16T13:20:58

attr: Cleanup the containing dir logic