Changed markup requires changing the tests slightly