(PUP-2400) Merge mount acceptance tests