Fix test refs right this time (using v2.16.x branch).