Revert "Fix neverending UT file"

This reverts commit 37420d7ea831113cdbf243e3aa695d1d4cbabedb.