Test rebased #4845

Trying to figure out why this breaks the tests now.