Fix tests after r21 compatibility removal