Eliminate redundant TestFile
in functional tests
#1083
+78
−845
Merged