Added test that tests Changeset merging
Organized imports, changed LocalFilesystem.path accessibility