Revert "Fix problem in TC test"

This reverts commit c61b4438dbf8c265c77610cc2e83925d9478293c.
Revert "Revert "Fix problem in TC test""

This reverts commit a16a03fc95ae803b6044559d8c504e5391f16528.