Revert "Fix unit tests"

This reverts commit 57b99a93dbe8b1b43bd5114e6ed5a2fa62c13afe.