More fixes done to tests.
Fixed more tests.
Corrected more tests.
Moved test data files.