Fix test failures from 1e16bc8705c57997f4b40a4656fc6454b24d6e2d