Corrected more test cases that need supplementary files.
Fixed another broken test case.