Moved test data related things to our test package.
Moved test data related things to our test package.
Added naming conventions.