Migrate merging tests to their own directory.
Re-add properties.