Update tests to be consistent with commit de1be9a25fda4aff88aa1349fdd7bb9d31be32ab