Updated tests for backports