Better shrinking on delete + Tests