Fixing more tests that broke with markup changes