msi/tests: Fix some test failures.