Merge new tests from the team into 1.3