F20 -> F21 test matrix and scope