More Edits test fixes.