support for file addition, plus tests, and test resources