Some tests fixed
Revert "Some tests fixed"

This reverts commit 9707ac29dde81b817e67a13ee209470e6a63718b.