Cleanup of the test data to make it more navigable. Added some
more validation files.