-re-implemented a few test files