Fix test failures
Revert "Fix test failures"

This reverts commit 3085cccde42efb3f13f728357bc601514ef582c7.