Revert "Fixed unit tests"

This reverts commit 89145e13fb9ce3b204601c4918b233cdf4f0938b.