Save model tests now all pass