I also updated tests here and below according to @cvan's comments.