Updated test files
Finished v3