refactored UnitTests. Renamed test file, test data removed to data dir