revised commit with preliminary test files