Propagate a1501bd091c... changes to tests