Adding save methods and merge methods with some tests