Fix failing system tests due to markup changes.