Removing the extra test files and adding those tests to existing files.