Revert "Fix unit tests"

This reverts commit afd3c8bbdc1d5d5620a67475080b1dda403dcabf.