Settings: Fix solution settings migration

Includes test case.
Still no test case for global migration