Migration test fixes
Merge pull request #966 from marcel-blonk/BRIDGE-38

Migration test fixes