fix tests, and make sure we shrink back down to tuples