Fix failing system tests from markup changes.