Revert "fix test errors"

This reverts commit d4876946dbfe4732eb02c7fc49ea8c8afd40e21b.