Revert "[misc] Fixed failing tests"

This reverts commit 0490efebb53c336494f0f73cba798e77fa309e8f.