Updated test files and validate script.
Merged in changes to the validation list.