some missing files and potential test fixes.