Restored UT cases + reduced UT run time

No match.