Additional test fixes for markup changes

[#72543482] https://www.pivotaltracker.com/story/show/72543482