Align with latest Golo tests