cleaning up test save code