tests: more bundle2 non-binary file test fixes

--HG--
branch : stable
merge with stable