simplify save, get old tests to pass