Consolidated src/test/java/testdata with src/test/java/testvcfs.