Markup tests refactoring