Improve test save method.