Fixes to tests around shrinking