Fix broken wrap-and-indent tests