Changes to test suggested by @charettes