Minor improvements for unfolding tests