Added more test files and fixed test files