Combine non-member save tests
relates #85