Few more test fixes

For test failures introduced in backup/export UI copy changes.