Revert "Fix unit tests"

This reverts commit 108a29d277bb5722cfd91f97aeb28ac13e137114.