Use tests from the old commit
Use tests from the old commit

Mostly unmodified tests from PR 5787 (not linked here to respect
contribution guidelines).

dilumnavanjana/bundler,bundler/bundler,mvz/bundler,mvz/bundler,dilumnavanjana/bundler,bundler/bundler