Add new test files, new tests