fixed tests for backport