add a return value for save()
Refactoring tests