Fix speed layer update test to match recent updated fold-in logic, and make it more accurate