Fix tests backwards compatibility