Minor fixes to tests.
Minor fixes to tests.
Added test data file.