Merge: Fix issues in tests introduced by previous series