Fixed save so tests pass