Ensure directories exist

Previously a couple of the tests failed on CI because directories they
depended on were not guaranteed to exist at test time.  This change
ensures those directories exist and that the tests pass.