renamed all test files

nette · Feb 8, 2022 · 8a98191 · 8a98191
1 parent 999228a
commit 8a98191
Show file tree

Hide file tree

Showing 332 changed files with 95 additions and 91 deletions.
diff --git a/tests/Latte/CachingIterator.basic.phpt → tests/common/CachingIterator.basic.phpt b/tests/Latte/CachingIterator.basic.phpt → tests/common/CachingIterator.basic.phpt
diff --git a/tests/Latte/CachingIterator.construct.phpt → tests/common/CachingIterator.construct.phpt b/tests/Latte/CachingIterator.construct.phpt → tests/common/CachingIterator.construct.phpt
diff --git a/tests/Latte/CachingIterator.magic.phpt → tests/common/CachingIterator.magic.phpt b/tests/Latte/CachingIterator.magic.phpt → tests/common/CachingIterator.magic.phpt
diff --git a/tests/Latte/CachingIterator.width.phpt → tests/common/CachingIterator.width.phpt b/tests/Latte/CachingIterator.width.phpt → tests/common/CachingIterator.width.phpt
diff --git a/tests/Latte/Compiler.emptyMacros.phpt → tests/common/Compiler.emptyMacros.phpt b/tests/Latte/Compiler.emptyMacros.phpt → tests/common/Compiler.emptyMacros.phpt
diff --git a/tests/Latte/Compiler.errors.phpt → tests/common/Compiler.errors.phpt b/tests/Latte/Compiler.errors.phpt → tests/common/Compiler.errors.phpt
diff --git a/.../Latte/Compiler.flag.ALLOWED_IN_HEAD.phpt → ...common/Compiler.flag.ALLOWED_IN_HEAD.phpt b/.../Latte/Compiler.flag.ALLOWED_IN_HEAD.phpt → ...common/Compiler.flag.ALLOWED_IN_HEAD.phpt
diff --git a/tests/Latte/Compiler.flag.AUTO_CLOSE.phpt → tests/common/Compiler.flag.AUTO_CLOSE.phpt b/tests/Latte/Compiler.flag.AUTO_CLOSE.phpt → tests/common/Compiler.flag.AUTO_CLOSE.phpt
diff --git a/tests/Latte/Compiler.flag.AUTO_EMPTY.phpt → tests/common/Compiler.flag.AUTO_EMPTY.phpt b/tests/Latte/Compiler.flag.AUTO_EMPTY.phpt → tests/common/Compiler.flag.AUTO_EMPTY.phpt
diff --git a/tests/Latte/Compiler.htmlNode.empty.phpt → tests/common/Compiler.htmlNode.empty.phpt b/tests/Latte/Compiler.htmlNode.empty.phpt → tests/common/Compiler.htmlNode.empty.phpt
diff --git a/tests/Latte/Compiler.htmlNode.lines.phpt → tests/common/Compiler.htmlNode.lines.phpt b/tests/Latte/Compiler.htmlNode.lines.phpt → tests/common/Compiler.htmlNode.lines.phpt
diff --git a/tests/Latte/Compiler.htmlNode.phpt → tests/common/Compiler.htmlNode.phpt b/tests/Latte/Compiler.htmlNode.phpt → tests/common/Compiler.htmlNode.phpt
diff --git a/tests/Latte/Compiler.macro.empty.phpt → tests/common/Compiler.macro.empty.phpt b/tests/Latte/Compiler.macro.empty.phpt → tests/common/Compiler.macro.empty.phpt
diff --git a/tests/Latte/Compiler.macro.lines.phpt → tests/common/Compiler.macro.lines.phpt b/tests/Latte/Compiler.macro.lines.phpt → tests/common/Compiler.macro.lines.phpt
diff --git a/...iler.macro.methodsCallingOrder.empty.phpt → ...iler.macro.methodsCallingOrder.empty.phpt b/...iler.macro.methodsCallingOrder.empty.phpt → ...iler.macro.methodsCallingOrder.empty.phpt
diff --git a/...e/Compiler.macro.methodsCallingOrder.phpt → ...n/Compiler.macro.methodsCallingOrder.phpt b/...e/Compiler.macro.methodsCallingOrder.phpt → ...n/Compiler.macro.methodsCallingOrder.phpt
diff --git a/tests/Latte/Compiler.macro.non-empty.phpt → tests/common/Compiler.macro.non-empty.phpt b/tests/Latte/Compiler.macro.non-empty.phpt → tests/common/Compiler.macro.non-empty.phpt
diff --git a/tests/Latte/Compiler.php.phpt → tests/common/Compiler.php.phpt b/tests/Latte/Compiler.php.phpt → tests/common/Compiler.php.phpt
diff --git a/tests/Latte/Compiler.recursiveMacro.phpt → tests/common/Compiler.recursiveMacro.phpt b/tests/Latte/Compiler.recursiveMacro.phpt → tests/common/Compiler.recursiveMacro.phpt
diff --git a/tests/Latte/Compiler.special.phpt → tests/common/Compiler.special.phpt b/tests/Latte/Compiler.special.phpt → tests/common/Compiler.special.phpt
diff --git a/tests/Latte/Compiler.unclosedMacro.phpt → tests/common/Compiler.unclosedMacro.phpt b/tests/Latte/Compiler.unclosedMacro.phpt → tests/common/Compiler.unclosedMacro.phpt
diff --git a/tests/Latte/Compiler.unexpectedMacro.phpt → tests/common/Compiler.unexpectedMacro.phpt b/tests/Latte/Compiler.unexpectedMacro.phpt → tests/common/Compiler.unexpectedMacro.phpt
diff --git a/tests/Latte/Compiler.unknownMacro.phpt → tests/common/Compiler.unknownMacro.phpt b/tests/Latte/Compiler.unknownMacro.phpt → tests/common/Compiler.unknownMacro.phpt
diff --git a/tests/Latte/Compiler.unquoted.phpt → tests/common/Compiler.unquoted.phpt b/tests/Latte/Compiler.unquoted.phpt → tests/common/Compiler.unquoted.phpt
diff --git a/tests/Latte/Compiler.whitespace.1.phpt → tests/common/Compiler.whitespace.1.phpt b/tests/Latte/Compiler.whitespace.1.phpt → tests/common/Compiler.whitespace.1.phpt
diff --git a/tests/Latte/Compiler.whitespace.2.phpt → tests/common/Compiler.whitespace.2.phpt b/tests/Latte/Compiler.whitespace.2.phpt → tests/common/Compiler.whitespace.2.phpt
diff --git a/...ompiler.writeAttrsMacro.innerContent.phpt → ...ompiler.writeAttrsMacro.innerContent.phpt b/...ompiler.writeAttrsMacro.innerContent.phpt → ...ompiler.writeAttrsMacro.innerContent.phpt
diff --git a/...Latte/Compiler.writeAttrsMacro.order.phpt → ...ommon/Compiler.writeAttrsMacro.order.phpt b/...Latte/Compiler.writeAttrsMacro.order.phpt → ...ommon/Compiler.writeAttrsMacro.order.phpt
diff --git a/tests/Latte/Compiler.xml.declaration.phpt → tests/common/Compiler.xml.declaration.phpt b/tests/Latte/Compiler.xml.declaration.phpt → tests/common/Compiler.xml.declaration.phpt
diff --git a/tests/Latte/Engine.compileException.phpt → tests/common/Engine.compileException.phpt b/tests/Latte/Engine.compileException.phpt → tests/common/Engine.compileException.phpt
diff --git a/tests/Latte/Engine.createTemplate.phpt → tests/common/Engine.createTemplate.phpt b/tests/Latte/Engine.createTemplate.phpt → tests/common/Engine.createTemplate.phpt
@@ -10,14 +10,14 @@ require __DIR__ . '/../bootstrap.php';
 
 $latte = new Latte\Engine;
 
-$template = $latte->createTemplate(__DIR__ . '/templates/general.latte');
+$template = $latte->createTemplate(__DIR__ . '/templates/block.latte');
 Assert::type(Latte\Runtime\Template::class, $template);
 Assert::null($template->getReferringTemplate());
 Assert::null($template->getReferenceType());
 Assert::same(['menu'], $template->getBlockNames());
 
 
-$template = $latte->createTemplate(__DIR__ . '/templates/general.latte');
+$template = $latte->createTemplate(__DIR__ . '/templates/block.latte');
 Assert::type(Latte\Runtime\Template::class, $template);
 Assert::null($template->getReferringTemplate());
 Assert::null($template->getReferenceType());

diff --git a/tests/Latte/Engine.customFunctions.phpt → tests/common/Engine.customFunctions.phpt b/tests/Latte/Engine.customFunctions.phpt → tests/common/Engine.customFunctions.phpt
diff --git a/tests/Latte/Engine.defaults.phpt → tests/common/Engine.defaults.phpt b/tests/Latte/Engine.defaults.phpt → tests/common/Engine.defaults.phpt
diff --git a/tests/Latte/Engine.exceptionHandler.phpt → tests/common/Engine.exceptionHandler.phpt b/tests/Latte/Engine.exceptionHandler.phpt → tests/common/Engine.exceptionHandler.phpt
diff --git a/tests/Latte/Engine.onCompile.phpt → tests/common/Engine.onCompile.phpt b/tests/Latte/Engine.onCompile.phpt → tests/common/Engine.onCompile.phpt
diff --git a/tests/Latte/Engine.paramsObject.phpt → tests/common/Engine.paramsObject.phpt b/tests/Latte/Engine.paramsObject.phpt → tests/common/Engine.paramsObject.phpt
diff --git a/tests/Latte/Engine.parseError.phpt → tests/common/Engine.parseError.phpt b/tests/Latte/Engine.parseError.phpt → tests/common/Engine.parseError.phpt
diff --git a/tests/Latte/Engine.providers.phpt → tests/common/Engine.providers.phpt b/tests/Latte/Engine.providers.phpt → tests/common/Engine.providers.phpt
diff --git a/tests/Latte/Engine.renderBlock.phpt → tests/common/Engine.renderBlock.phpt b/tests/Latte/Engine.renderBlock.phpt → tests/common/Engine.renderBlock.phpt
diff --git a/tests/Latte/Engine.strictTypes.phpt → tests/common/Engine.strictTypes.phpt b/tests/Latte/Engine.strictTypes.phpt → tests/common/Engine.strictTypes.phpt
diff --git a/tests/Latte/Engine.warmupCache.phpt → tests/common/Engine.warmupCache.phpt b/tests/Latte/Engine.warmupCache.phpt → tests/common/Engine.warmupCache.phpt
@@ -12,7 +12,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 test('', function () {
-	$template = __DIR__ . '/templates/general.latte';
+	$template = __DIR__ . '/templates/block.latte';
 
 	$latte = new Latte\Engine;
 	$latte->setTempDirectory(getTempDir());

diff --git a/tests/Latte/FilterExecutor.phpt → tests/common/FilterExecutor.phpt b/tests/Latte/FilterExecutor.phpt → tests/common/FilterExecutor.phpt
diff --git a/tests/Latte/Helpers.getSuggestion().phpt → tests/common/Helpers.getSuggestion().phpt b/tests/Latte/Helpers.getSuggestion().phpt → tests/common/Helpers.getSuggestion().phpt
diff --git a/tests/Latte/Loaders.FileLoader.phpt → tests/common/Loaders.FileLoader.phpt b/tests/Latte/Loaders.FileLoader.phpt → tests/common/Loaders.FileLoader.phpt
@@ -33,17 +33,17 @@ Assert::exception(function () {
 
 
 $loader = new FileLoader(dirname(__DIR__));
-Assert::same(file_get_contents(__FILE__), $loader->getContent('Latte/' . basename(__FILE__)));
+Assert::same(file_get_contents(__FILE__), $loader->getContent('common/' . basename(__FILE__)));
 
 Assert::exception(function () use ($loader) {
-	$loader->getContent('Latte/.././../file');
-}, Latte\RuntimeException::class, "Template '%a%Latte/.././../file' is not within the allowed path '%a%'.");
+	$loader->getContent('common/.././../file');
+}, Latte\RuntimeException::class, "Template '%a%common/.././../file' is not within the allowed path '%a%'.");
 
-Assert::false($loader->isExpired('Latte/' . basename(__FILE__), filemtime(__FILE__) + 1));
-Assert::true($loader->isExpired('Latte/' . basename(__FILE__), filemtime(__FILE__) - 1));
+Assert::false($loader->isExpired('common/' . basename(__FILE__), filemtime(__FILE__) + 1));
+Assert::true($loader->isExpired('common/' . basename(__FILE__), filemtime(__FILE__) - 1));
 
-Assert::same('Latte' . DIRECTORY_SEPARATOR . 'new', $loader->getReferredName('new', 'Latte/file'));
-Assert::same('Latte', $loader->getReferredName('Latte', 'file'));
+Assert::same('common' . DIRECTORY_SEPARATOR . 'new', $loader->getReferredName('new', 'common/file'));
+Assert::same('common', $loader->getReferredName('common', 'file'));
 Assert::same('..' . DIRECTORY_SEPARATOR . 'tests', $loader->getReferredName('../tests', 'file'));
 Assert::same('..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'tests', $loader->getReferredName('../tests', '../file'));
 Assert::same(str_repeat('..' . DIRECTORY_SEPARATOR, 7) . 'tests', $loader->getReferredName('../../../../tests', '../../../file'));
diff --git a/tests/Latte/Loaders.StringLoader.phpt → tests/common/Loaders.StringLoader.phpt b/tests/Latte/Loaders.StringLoader.phpt → tests/common/Loaders.StringLoader.phpt
diff --git a/tests/Latte/MacroSet.basic.phpt → tests/common/MacroSet.basic.phpt b/tests/Latte/MacroSet.basic.phpt → tests/common/MacroSet.basic.phpt
diff --git a/tests/Latte/MacroTokens.append().phpt → tests/common/MacroTokens.append().phpt b/tests/Latte/MacroTokens.append().phpt → tests/common/MacroTokens.append().phpt
diff --git a/tests/Latte/MacroTokens.fetchWord().phpt → tests/common/MacroTokens.fetchWord().phpt b/tests/Latte/MacroTokens.fetchWord().phpt → tests/common/MacroTokens.fetchWord().phpt
diff --git a/tests/Latte/MacroTokens.fetchWords().phpt → tests/common/MacroTokens.fetchWords().phpt b/tests/Latte/MacroTokens.fetchWords().phpt → tests/common/MacroTokens.fetchWords().phpt
diff --git a/tests/Latte/Parser.errors.phpt → tests/common/Parser.errors.phpt b/tests/Latte/Parser.errors.phpt → tests/common/Parser.errors.phpt
diff --git a/...s/Latte/Parser.expandMacro.reentrant.phpt → .../common/Parser.expandMacro.reentrant.phpt b/...s/Latte/Parser.expandMacro.reentrant.phpt → .../common/Parser.expandMacro.reentrant.phpt
diff --git a/tests/Latte/Parser.parse.phpt → tests/common/Parser.parse.phpt b/tests/Latte/Parser.parse.phpt → tests/common/Parser.parse.phpt
diff --git a/tests/Latte/Parser.parseMacroTag.phpt → tests/common/Parser.parseMacroTag.phpt b/tests/Latte/Parser.parseMacroTag.phpt → tests/common/Parser.parseMacroTag.phpt
diff --git a/tests/Latte/Parser.setContentType.phpt → tests/common/Parser.setContentType.phpt b/tests/Latte/Parser.setContentType.phpt → tests/common/Parser.setContentType.phpt
diff --git a/tests/Latte/Parser.shortNoEscape.phpt → tests/common/Parser.shortNoEscape.phpt b/tests/Latte/Parser.shortNoEscape.phpt → tests/common/Parser.shortNoEscape.phpt
diff --git a/tests/Latte/PhpHelpers.dump().phpt → tests/common/PhpHelpers.dump().phpt b/tests/Latte/PhpHelpers.dump().phpt → tests/common/PhpHelpers.dump().phpt
diff --git a/.../Latte/PhpHelpers.inlineHtmlToEcho().phpt → ...common/PhpHelpers.inlineHtmlToEcho().phpt b/.../Latte/PhpHelpers.inlineHtmlToEcho().phpt → ...common/PhpHelpers.inlineHtmlToEcho().phpt
diff --git a/tests/Latte/PhpHelpers.reformatCode().phpt → tests/common/PhpHelpers.reformatCode().phpt b/tests/Latte/PhpHelpers.reformatCode().phpt → tests/common/PhpHelpers.reformatCode().phpt
diff --git a/tests/Latte/PhpWriter.formatArgs().phpt → tests/common/PhpWriter.formatArgs().phpt b/tests/Latte/PhpWriter.formatArgs().phpt → tests/common/PhpWriter.formatArgs().phpt
diff --git a/tests/Latte/PhpWriter.formatArray().phpt → tests/common/PhpWriter.formatArray().phpt b/tests/Latte/PhpWriter.formatArray().phpt → tests/common/PhpWriter.formatArray().phpt
diff --git a/tests/Latte/PhpWriter.formatModifiers().phpt → ...s/common/PhpWriter.formatModifiers().phpt b/tests/Latte/PhpWriter.formatModifiers().phpt → ...s/common/PhpWriter.formatModifiers().phpt
diff --git a/tests/Latte/PhpWriter.formatWord().phpt → tests/common/PhpWriter.formatWord().phpt b/tests/Latte/PhpWriter.formatWord().phpt → tests/common/PhpWriter.formatWord().phpt
diff --git a/...Latte/PhpWriter.namedArgumentsPass().phpt → ...ommon/PhpWriter.namedArgumentsPass().phpt b/...Latte/PhpWriter.namedArgumentsPass().phpt → ...ommon/PhpWriter.namedArgumentsPass().phpt
diff --git a/.../PhpWriter.optionalChainingPass().80.phpt → .../PhpWriter.optionalChainingPass().80.phpt b/.../PhpWriter.optionalChainingPass().80.phpt → .../PhpWriter.optionalChainingPass().80.phpt
diff --git a/...er.optionalChainingPass().coalescing.phpt → ...er.optionalChainingPass().coalescing.phpt b/...er.optionalChainingPass().coalescing.phpt → ...er.optionalChainingPass().coalescing.phpt
diff --git a/...tte/PhpWriter.optionalChainingPass().phpt → ...mon/PhpWriter.optionalChainingPass().phpt b/...tte/PhpWriter.optionalChainingPass().phpt → ...mon/PhpWriter.optionalChainingPass().phpt
diff --git a/tests/Latte/Policy.Logger.php → tests/common/Policy.Logger.php b/tests/Latte/Policy.Logger.php → tests/common/Policy.Logger.php
diff --git a/tests/Latte/Policy.SecurityPolicy.phpt → tests/common/Policy.SecurityPolicy.phpt b/tests/Latte/Policy.SecurityPolicy.phpt → tests/common/Policy.SecurityPolicy.phpt
diff --git a/tests/Latte/Policy.filters.phpt → tests/common/Policy.filters.phpt b/tests/Latte/Policy.filters.phpt → tests/common/Policy.filters.phpt
diff --git a/tests/Latte/Policy.fixtures.php → tests/common/Policy.fixtures.php b/tests/Latte/Policy.fixtures.php → tests/common/Policy.fixtures.php
diff --git a/...s/Latte/Policy.invocations+functions.phpt → .../common/Policy.invocations+functions.phpt b/...s/Latte/Policy.invocations+functions.phpt → .../common/Policy.invocations+functions.phpt
diff --git a/tests/Latte/Policy.invocations.phpt → tests/common/Policy.invocations.phpt b/tests/Latte/Policy.invocations.phpt → tests/common/Policy.invocations.phpt
diff --git a/tests/Latte/Policy.macros.phpt → tests/common/Policy.macros.phpt b/tests/Latte/Policy.macros.phpt → tests/common/Policy.macros.phpt
diff --git a/...atte/Policy.properties.operators.add.phpt → ...mmon/Policy.properties.operators.add.phpt b/...atte/Policy.properties.operators.add.phpt → ...mmon/Policy.properties.operators.add.phpt
diff --git a/tests/Latte/Policy.properties.operators.phpt → ...s/common/Policy.properties.operators.phpt b/tests/Latte/Policy.properties.operators.phpt → ...s/common/Policy.properties.operators.phpt
diff --git a/tests/Latte/Policy.properties.phpt → tests/common/Policy.properties.phpt b/tests/Latte/Policy.properties.phpt → tests/common/Policy.properties.phpt
diff --git a/tests/Latte/Policy.sandboxPass.phpt → tests/common/Policy.sandboxPass.phpt b/tests/Latte/Policy.sandboxPass.phpt → tests/common/Policy.sandboxPass.phpt
diff --git a/tests/Latte/Policy.setSandboxMode.phpt → tests/common/Policy.setSandboxMode.phpt b/tests/Latte/Policy.setSandboxMode.phpt → tests/common/Policy.setSandboxMode.phpt
diff --git a/tests/Latte/Policy.violations.phpt → tests/common/Policy.violations.phpt b/tests/Latte/Policy.violations.phpt → tests/common/Policy.violations.phpt
diff --git a/tests/Latte/Safe.url.phpt → tests/common/Safe.url.phpt b/tests/Latte/Safe.url.phpt → tests/common/Safe.url.phpt
diff --git a/tests/Latte/Strict.phpt → tests/common/Strict.phpt b/tests/Latte/Strict.phpt → tests/common/Strict.phpt
diff --git a/tests/Latte/Template.getContentType().phpt → tests/common/Template.getContentType().phpt b/tests/Latte/Template.getContentType().phpt → tests/common/Template.getContentType().phpt
diff --git a/tests/Latte/Template.getParentName().phpt → tests/common/Template.getParentName().phpt b/tests/Latte/Template.getParentName().phpt → tests/common/Template.getParentName().phpt
diff --git a/tests/Latte/TokenIterator.join.phpt → tests/common/TokenIterator.join.phpt b/tests/Latte/TokenIterator.join.phpt → tests/common/TokenIterator.join.phpt
diff --git a/tests/Latte/TokenIterator.traversing.phpt → tests/common/TokenIterator.traversing.phpt b/tests/Latte/TokenIterator.traversing.phpt → tests/common/TokenIterator.traversing.phpt
diff --git a/tests/Latte/Tokenizer.getCoordinates.phpt → tests/common/Tokenizer.getCoordinates.phpt b/tests/Latte/Tokenizer.getCoordinates.phpt → tests/common/Tokenizer.getCoordinates.phpt
diff --git a/tests/Latte/Tokenizer.namedTokens.phpt → tests/common/Tokenizer.namedTokens.phpt b/tests/Latte/Tokenizer.namedTokens.phpt → tests/common/Tokenizer.namedTokens.phpt
diff --git a/tests/Latte/contentType.compatibility.phpt → tests/common/contentType.compatibility.phpt b/tests/Latte/contentType.compatibility.phpt → tests/common/contentType.compatibility.phpt
diff --git a/tests/Latte/contentType.html.comments.phpt → tests/common/contentType.html.comments.phpt b/tests/Latte/contentType.html.comments.phpt → tests/common/contentType.html.comments.phpt
diff --git a/tests/Latte/contentType.html.css.phpt → tests/common/contentType.html.css.phpt b/tests/Latte/contentType.html.css.phpt → tests/common/contentType.html.css.phpt
diff --git a/tests/Latte/contentType.html.javascript.phpt → ...s/common/contentType.html.javascript.phpt b/tests/Latte/contentType.html.javascript.phpt → ...s/common/contentType.html.javascript.phpt
diff --git a/tests/Latte/contentType.ical.phpt → tests/common/contentType.ical.phpt b/tests/Latte/contentType.ical.phpt → tests/common/contentType.ical.phpt
diff --git a/tests/Latte/contentType.xml.phpt → tests/common/contentType.xml.phpt b/tests/Latte/contentType.xml.phpt → tests/common/contentType.xml.phpt
diff --git a/...e/expected/Compiler.recursive.macro.phtml → ...n/expected/Compiler.recursive.macro.phtml b/...e/expected/Compiler.recursive.macro.phtml → ...n/expected/Compiler.recursive.macro.phtml
diff --git a/...tte/expected/Compiler.unquoted.attrs.html → ...mon/expected/Compiler.unquoted.attrs.html b/...tte/expected/Compiler.unquoted.attrs.html → ...mon/expected/Compiler.unquoted.attrs.html
diff --git a/...te/expected/Compiler.unquoted.attrs.phtml → ...on/expected/Compiler.unquoted.attrs.phtml b/...te/expected/Compiler.unquoted.attrs.phtml → ...on/expected/Compiler.unquoted.attrs.phtml
diff --git a/.../expected/PhpHelpers.reformatCode().phtml → .../expected/PhpHelpers.reformatCode().phtml b/.../expected/PhpHelpers.reformatCode().phtml → .../expected/PhpHelpers.reformatCode().phtml
diff --git a/...pected/Policy.sandboxPass.callbacks.phtml → ...pected/Policy.sandboxPass.callbacks.phtml b/...pected/Policy.sandboxPass.callbacks.phtml → ...pected/Policy.sandboxPass.callbacks.phtml
diff --git a/.../expected/Policy.sandboxPass.consts.phtml → .../expected/Policy.sandboxPass.consts.phtml b/.../expected/Policy.sandboxPass.consts.phtml → .../expected/Policy.sandboxPass.consts.phtml
diff --git a/...pected/Policy.sandboxPass.functions.phtml → ...pected/Policy.sandboxPass.functions.phtml b/...pected/Policy.sandboxPass.functions.phtml → ...pected/Policy.sandboxPass.functions.phtml
diff --git a/...d/Policy.sandboxPass.object.methods.phtml → ...d/Policy.sandboxPass.object.methods.phtml b/...d/Policy.sandboxPass.object.methods.phtml → ...d/Policy.sandboxPass.object.methods.phtml
diff --git a/...cy.sandboxPass.optional-chaining.80.phtml → ...cy.sandboxPass.optional-chaining.80.phtml b/...cy.sandboxPass.optional-chaining.80.phtml → ...cy.sandboxPass.optional-chaining.80.phtml
diff --git a/...olicy.sandboxPass.optional-chaining.phtml → ...olicy.sandboxPass.optional-chaining.phtml b/...olicy.sandboxPass.optional-chaining.phtml → ...olicy.sandboxPass.optional-chaining.phtml
diff --git a/...e/expected/Policy.sandboxPass.props.phtml → ...n/expected/Policy.sandboxPass.props.phtml b/...e/expected/Policy.sandboxPass.props.phtml → ...n/expected/Policy.sandboxPass.props.phtml
diff --git a/...ected/Policy.sandboxPass.read-write.phtml → ...ected/Policy.sandboxPass.read-write.phtml b/...ected/Policy.sandboxPass.read-write.phtml → ...ected/Policy.sandboxPass.read-write.phtml
diff --git a/...d/Policy.sandboxPass.static.methods.phtml → ...d/Policy.sandboxPass.static.methods.phtml b/...d/Policy.sandboxPass.static.methods.phtml → ...d/Policy.sandboxPass.static.methods.phtml
diff --git a/...ted/Policy.sandboxPass.static.props.phtml → ...ted/Policy.sandboxPass.static.props.phtml b/...ted/Policy.sandboxPass.static.props.phtml → ...ted/Policy.sandboxPass.static.props.phtml
diff --git a/...te/expected/Policy.sandboxPass.vars.phtml → ...on/expected/Policy.sandboxPass.vars.phtml b/...te/expected/Policy.sandboxPass.vars.phtml → ...on/expected/Policy.sandboxPass.vars.phtml
diff --git a/...e/expected/contentType.html.comments.html → ...n/expected/contentType.html.comments.html b/...e/expected/contentType.html.comments.html → ...n/expected/contentType.html.comments.html
diff --git a/tests/Latte/expected/contentType.ical.html → tests/common/expected/contentType.ical.html b/tests/Latte/expected/contentType.ical.html → tests/common/expected/contentType.ical.html
diff --git a/tests/Latte/expected/contentType.ical.phtml → tests/common/expected/contentType.ical.phtml b/tests/Latte/expected/contentType.ical.phtml → tests/common/expected/contentType.ical.phtml
diff --git a/tests/Latte/expected/contentType.xml.html → tests/common/expected/contentType.xml.html b/tests/Latte/expected/contentType.xml.html → tests/common/expected/contentType.xml.html
diff --git a/tests/Latte/expected/contentType.xml.phtml → tests/common/expected/contentType.xml.phtml b/tests/Latte/expected/contentType.xml.phtml → tests/common/expected/contentType.xml.phtml
diff --git a/tests/Latte/fixes.phpt → tests/common/fixes.phpt b/tests/Latte/fixes.phpt → tests/common/fixes.phpt
diff --git a/...templates/PhpHelpers.reformatCode().phtml → ...templates/PhpHelpers.reformatCode().phtml b/...templates/PhpHelpers.reformatCode().phtml → ...templates/PhpHelpers.reformatCode().phtml
diff --git a/tests/common/templates/block.latte b/tests/common/templates/block.latte
@@ -0,0 +1,4 @@
+{block menu}
+<ul>
+</ul>
+{/block}
diff --git a/...templates/contentType.html.comments.latte → ...templates/contentType.html.comments.latte b/...templates/contentType.html.comments.latte → ...templates/contentType.html.comments.latte
diff --git a/tests/Latte/templates/contentType.xml.latte → tests/common/templates/contentType.xml.latte b/tests/Latte/templates/contentType.xml.latte → tests/common/templates/contentType.xml.latte
diff --git a/tests/Latte/Filters.batch().phpt → tests/filters/batch.phpt b/tests/Latte/Filters.batch().phpt → tests/filters/batch.phpt
diff --git a/tests/Latte/Filters.breaklines().phpt → tests/filters/breaklines.phpt b/tests/Latte/Filters.breaklines().phpt → tests/filters/breaklines.phpt
diff --git a/tests/Latte/Filters.bytes().phpt → tests/filters/bytes.phpt b/tests/Latte/Filters.bytes().phpt → tests/filters/bytes.phpt
diff --git a/tests/Latte/Filters.ceil().phpt → tests/filters/ceil.phpt b/tests/Latte/Filters.ceil().phpt → tests/filters/ceil.phpt
diff --git a/tests/Latte/Filters.clamp().phpt → tests/filters/clamp.phpt b/tests/Latte/Filters.clamp().phpt → tests/filters/clamp.phpt
diff --git a/tests/Latte/Filters.contentTypes.phpt → tests/filters/contentTypes.phpt b/tests/Latte/Filters.contentTypes.phpt → tests/filters/contentTypes.phpt
diff --git a/tests/Latte/Filters.date().phpt → tests/filters/date.phpt b/tests/Latte/Filters.date().phpt → tests/filters/date.phpt
diff --git a/tests/Latte/Filters.divisibleBy().phpt → tests/filters/divisibleBy.phpt b/tests/Latte/Filters.divisibleBy().phpt → tests/filters/divisibleBy.phpt
diff --git a/tests/Latte/Filters.escapeCss().phpt → tests/filters/escapeCss.phpt b/tests/Latte/Filters.escapeCss().phpt → tests/filters/escapeCss.phpt
diff --git a/tests/Latte/Filters.escapeHtml().phpt → tests/filters/escapeHtml.phpt b/tests/Latte/Filters.escapeHtml().phpt → tests/filters/escapeHtml.phpt
diff --git a/tests/Latte/Filters.escapeHtmlAttr().phpt → tests/filters/escapeHtmlAttr.phpt b/tests/Latte/Filters.escapeHtmlAttr().phpt → tests/filters/escapeHtmlAttr.phpt
diff --git a/...s/Latte/Filters.escapeHtmlAttrConv().phpt → tests/filters/escapeHtmlAttrConv.phpt b/...s/Latte/Filters.escapeHtmlAttrConv().phpt → tests/filters/escapeHtmlAttrConv.phpt
diff --git a/...tte/Filters.escapeHtmlAttrUnquoted().phpt → tests/filters/escapeHtmlAttrUnquoted.phpt b/...tte/Filters.escapeHtmlAttrUnquoted().phpt → tests/filters/escapeHtmlAttrUnquoted.phpt
diff --git a/tests/Latte/Filters.escapeHtmlComment().phpt → tests/filters/escapeHtmlComment.phpt b/tests/Latte/Filters.escapeHtmlComment().phpt → tests/filters/escapeHtmlComment.phpt
diff --git a/tests/Latte/Filters.escapeHtmlRawText().phpt → tests/filters/escapeHtmlRawText.phpt b/tests/Latte/Filters.escapeHtmlRawText().phpt → tests/filters/escapeHtmlRawText.phpt
diff --git a/tests/Latte/Filters.escapeHtmlText().phpt → tests/filters/escapeHtmlText.phpt b/tests/Latte/Filters.escapeHtmlText().phpt → tests/filters/escapeHtmlText.phpt
diff --git a/tests/Latte/Filters.escapeICal().phpt → tests/filters/escapeICal.phpt b/tests/Latte/Filters.escapeICal().phpt → tests/filters/escapeICal.phpt
diff --git a/tests/Latte/Filters.escapeJs().phpt → tests/filters/escapeJs.phpt b/tests/Latte/Filters.escapeJs().phpt → tests/filters/escapeJs.phpt
diff --git a/tests/Latte/Filters.escapeXml().phpt → tests/filters/escapeXml.phpt b/tests/Latte/Filters.escapeXml().phpt → tests/filters/escapeXml.phpt
diff --git a/...atte/Filters.escapeXmlAttrUnquoted().phpt → tests/filters/escapeXmlAttrUnquoted.phpt b/...atte/Filters.escapeXmlAttrUnquoted().phpt → tests/filters/escapeXmlAttrUnquoted.phpt
diff --git a/tests/Latte/Filters.even().phpt → tests/filters/even.phpt b/tests/Latte/Filters.even().phpt → tests/filters/even.phpt
diff --git a/tests/Latte/expected/filters.general.html → tests/filters/expected/general.html b/tests/Latte/expected/filters.general.html → tests/filters/expected/general.html
diff --git a/tests/Latte/expected/filters.general.phtml → tests/filters/expected/general.phtml b/tests/Latte/expected/filters.general.phtml → tests/filters/expected/general.phtml
diff --git a/tests/Latte/Filters.explode().phpt → tests/filters/explode.phpt b/tests/Latte/Filters.explode().phpt → tests/filters/explode.phpt
diff --git a/tests/Latte/Filters.first().phpt → tests/filters/first.phpt b/tests/Latte/Filters.first().phpt → tests/filters/first.phpt
diff --git a/tests/Latte/Filters.floor().phpt → tests/filters/floor.phpt b/tests/Latte/Filters.floor().phpt → tests/filters/floor.phpt
diff --git a/tests/Latte/Filters.general.phpt → tests/filters/general.phpt b/tests/Latte/Filters.general.phpt → tests/filters/general.phpt
@@ -72,13 +72,13 @@ $params['hello'] = 'Hello World';
 $params['date'] = strtotime('2008-01-02');
 
 Assert::matchFile(
-	__DIR__ . '/expected/filters.general.phtml',
-	$latte->compile(__DIR__ . '/templates/filters.general.latte')
+	__DIR__ . '/expected/general.phtml',
+	$latte->compile(__DIR__ . '/templates/general.latte')
 );
 Assert::matchFile(
-	__DIR__ . '/expected/filters.general.html',
+	__DIR__ . '/expected/general.html',
 	$latte->renderToString(
-		__DIR__ . '/templates/filters.general.latte',
+		__DIR__ . '/templates/general.latte',
 		$params
 	)
 );
diff --git a/tests/Latte/Filters.htmlAttributes().phpt → tests/filters/htmlAttributes.phpt b/tests/Latte/Filters.htmlAttributes().phpt → tests/filters/htmlAttributes.phpt
diff --git a/tests/Latte/Filters.implode().phpt → tests/filters/implode.phpt b/tests/Latte/Filters.implode().phpt → tests/filters/implode.phpt
diff --git a/tests/Latte/Filters.indent().phpt → tests/filters/indent.phpt b/tests/Latte/Filters.indent().phpt → tests/filters/indent.phpt
diff --git a/tests/Latte/Filters.last().phpt → tests/filters/last.phpt b/tests/Latte/Filters.last().phpt → tests/filters/last.phpt
diff --git a/tests/Latte/Filters.length().phpt → tests/filters/length.phpt b/tests/Latte/Filters.length().phpt → tests/filters/length.phpt
diff --git a/tests/Latte/Filters.odd().phpt → tests/filters/odd.phpt b/tests/Latte/Filters.odd().phpt → tests/filters/odd.phpt
diff --git a/tests/Latte/Filters.padLeft().phpt → tests/filters/padLeft.phpt b/tests/Latte/Filters.padLeft().phpt → tests/filters/padLeft.phpt
diff --git a/tests/Latte/Filters.padRight().phpt → tests/filters/padRight.phpt b/tests/Latte/Filters.padRight().phpt → tests/filters/padRight.phpt
diff --git a/tests/Latte/Filters.query().phpt → tests/filters/query.phpt b/tests/Latte/Filters.query().phpt → tests/filters/query.phpt
diff --git a/tests/Latte/Filters.random().phpt → tests/filters/random.phpt b/tests/Latte/Filters.random().phpt → tests/filters/random.phpt
diff --git a/tests/Latte/Filters.repeat().phpt → tests/filters/repeat.phpt b/tests/Latte/Filters.repeat().phpt → tests/filters/repeat.phpt
diff --git a/tests/Latte/Filters.replace().phpt → tests/filters/replace.phpt b/tests/Latte/Filters.replace().phpt → tests/filters/replace.phpt
diff --git a/tests/Latte/Filters.reverse().phpt → tests/filters/reverse.phpt b/tests/Latte/Filters.reverse().phpt → tests/filters/reverse.phpt
diff --git a/tests/Latte/Filters.round().phpt → tests/filters/round.phpt b/tests/Latte/Filters.round().phpt → tests/filters/round.phpt
diff --git a/tests/Latte/Filters.safeUrl().phpt → tests/filters/safeUrl.phpt b/tests/Latte/Filters.safeUrl().phpt → tests/filters/safeUrl.phpt
diff --git a/tests/Latte/Filters.slice().phpt → tests/filters/slice.phpt b/tests/Latte/Filters.slice().phpt → tests/filters/slice.phpt
diff --git a/tests/Latte/Filters.sort().phpt → tests/filters/sort.phpt b/tests/Latte/Filters.sort().phpt → tests/filters/sort.phpt
diff --git a/tests/Latte/Filters.strip().phpt → tests/filters/strip.phpt b/tests/Latte/Filters.strip().phpt → tests/filters/strip.phpt
diff --git a/tests/Latte/Filters.stripHtml().phpt → tests/filters/stripHtml.phpt b/tests/Latte/Filters.stripHtml().phpt → tests/filters/stripHtml.phpt
diff --git a/tests/Latte/Filters.stripTags().phpt → tests/filters/stripTags.phpt b/tests/Latte/Filters.stripTags().phpt → tests/filters/stripTags.phpt
diff --git a/tests/Latte/Filters.substring().phpt → tests/filters/substring.phpt b/tests/Latte/Filters.substring().phpt → tests/filters/substring.phpt
diff --git a/tests/Latte/templates/filters.general.latte → tests/filters/templates/general.latte b/tests/Latte/templates/filters.general.latte → tests/filters/templates/general.latte
diff --git a/tests/Latte/Filters.trim().phpt → tests/filters/trim.phpt b/tests/Latte/Filters.trim().phpt → tests/filters/trim.phpt
diff --git a/tests/Latte/Filters.truncate().phpt → tests/filters/truncate.phpt b/tests/Latte/Filters.truncate().phpt → tests/filters/truncate.phpt
diff --git a/.../Latte/BlockMacros.block.autoclosing.phpt → tests/tags/block.autoclosing.phpt b/.../Latte/BlockMacros.block.autoclosing.phpt → tests/tags/block.autoclosing.phpt
diff --git a/tests/Latte/BlockMacros.block.breaking.phpt → tests/tags/block.breaking.phpt b/tests/Latte/BlockMacros.block.breaking.phpt → tests/tags/block.breaking.phpt
@@ -27,7 +27,7 @@ $template = <<<'XX'
 XX;
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.breaking.phtml',
+	__DIR__ . '/expected/breaking.phtml',
 	$latte->compile($template)
 );
 Assert::match(

diff --git a/tests/Latte/BlockMacros.dynamicblock.phpt → tests/tags/block.dynamic.phpt b/tests/Latte/BlockMacros.dynamicblock.phpt → tests/tags/block.dynamic.phpt
@@ -43,10 +43,10 @@ $template = <<<'EOD'
 EOD;
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.dynamicblock.phtml',
+	__DIR__ . '/expected/block.dynamic.phtml',
 	$latte->compile($template)
 );
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.dynamicblock.html',
+	__DIR__ . '/expected/block.dynamic.html',
 	$latte->renderToString($template)
 );
diff --git a/tests/Latte/BlockMacros.local.dynamic.phpt → tests/tags/block.local.dynamic.phpt b/tests/Latte/BlockMacros.local.dynamic.phpt → tests/tags/block.local.dynamic.phpt
@@ -44,10 +44,10 @@ $template = <<<'EOD'
 EOD;
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.local.dynamic.phtml',
+	__DIR__ . '/expected/block.local.dynamic.phtml',
 	$latte->compile($template)
 );
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.local.dynamic.html',
+	__DIR__ . '/expected/block.local.dynamic.html',
 	$latte->renderToString($template)
 );
diff --git a/tests/Latte/BlockMacros.local.phpt → tests/tags/block.local.phpt b/tests/Latte/BlockMacros.local.phpt → tests/tags/block.local.phpt
diff --git a/tests/Latte/BlockMacros.block.texy.phpt → tests/tags/block.texy.phpt b/tests/Latte/BlockMacros.block.texy.phpt → tests/tags/block.texy.phpt
diff --git a/tests/Latte/BlockMacros.block.vars.phpt → tests/tags/block.vars.phpt b/tests/Latte/BlockMacros.block.vars.phpt → tests/tags/block.vars.phpt
@@ -51,10 +51,10 @@ $template = <<<'XX'
 XX;
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.vars.phtml',
+	__DIR__ . '/expected/vars.phtml',
 	$latte->compile($template)
 );
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.vars.html',
+	__DIR__ . '/expected/vars.html',
 	$latte->renderToString($template)
 );
diff --git a/tests/Latte/BlockMacros.block1.phpt → tests/tags/block1.phpt b/tests/Latte/BlockMacros.block1.phpt → tests/tags/block1.phpt
diff --git a/tests/Latte/BlockMacros.block2.phpt → tests/tags/block2.phpt b/tests/Latte/BlockMacros.block2.phpt → tests/tags/block2.phpt
diff --git a/tests/Latte/BlockMacros.block3.phpt → tests/tags/block3.phpt b/tests/Latte/BlockMacros.block3.phpt → tests/tags/block3.phpt
diff --git a/tests/Latte/BlockMacros.block5.phpt → tests/tags/block5.phpt b/tests/Latte/BlockMacros.block5.phpt → tests/tags/block5.phpt
diff --git a/tests/Latte/BlockMacros.block6.phpt → tests/tags/block6.phpt b/tests/Latte/BlockMacros.block6.phpt → tests/tags/block6.phpt
diff --git a/tests/Latte/CoreMacros.capture.phpt → tests/tags/capture.phpt b/tests/Latte/CoreMacros.capture.phpt → tests/tags/capture.phpt
diff --git a/tests/Latte/CoreMacros.debugbreak.phpt → tests/tags/debugbreak.phpt b/tests/Latte/CoreMacros.debugbreak.phpt → tests/tags/debugbreak.phpt
diff --git a/tests/Latte/BlockMacros.define.args.phpt → tests/tags/define.args.phpt b/tests/Latte/BlockMacros.define.args.phpt → tests/tags/define.args.phpt
@@ -35,11 +35,11 @@ d) {include test null}
 XX;
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.args1.phtml',
+	__DIR__ . '/expected/define.args1.phtml',
 	$latte->compile($template)
 );
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.args1.html',
+	__DIR__ . '/expected/define.args1.html',
 	$latte->renderToString($template, ['hello' => 'world'])
 );
 
@@ -53,7 +53,7 @@ $template = <<<'XX'
 XX;
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.typehints.phtml',
+	__DIR__ . '/expected/define.typehints.phtml',
 	$latte->compile($template)
 );
 
@@ -76,11 +76,11 @@ d) {include test, var2 => 1, 2} // invalid
 XX;
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.args2.phtml',
+	__DIR__ . '/expected/define.args2.phtml',
 	$latte->compile($template)
 );
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.args2.html',
+	__DIR__ . '/expected/define.args2.html',
 	$latte->renderToString($template, ['var3' => 'outer'])
 );
 
@@ -101,7 +101,7 @@ c) {include test, hello => 1}
 XX;
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.args3.phtml',
+	__DIR__ . '/expected/define.args3.phtml',
 	$latte->compile($template)
 );
 
@@ -126,11 +126,11 @@ c) {include test, hello => 1}',
 ]));
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.args4.phtml',
+	__DIR__ . '/expected/define.args4.phtml',
 	$latte->compile('main')
 );
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.args4.html',
+	__DIR__ . '/expected/define.args4.html',
 	$latte->renderToString('main', ['var3' => 'outer'])
 );
 
@@ -150,10 +150,10 @@ b) {include test, var1 => 1}
 XX;
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.args5.phtml',
+	__DIR__ . '/expected/define.args5.phtml',
 	$latte->compile($template)
 );
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.args5.html',
+	__DIR__ . '/expected/define.args5.html',
 	$latte->renderToString($template)
 );
diff --git a/tests/Latte/BlockMacros.define.phpt → tests/tags/define.phpt b/tests/Latte/BlockMacros.define.phpt → tests/tags/define.phpt
@@ -29,10 +29,10 @@ $template = <<<'XX'
 XX;
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.phtml',
+	__DIR__ . '/expected/define.phtml',
 	$latte->compile($template)
 );
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.define.html',
+	__DIR__ . '/expected/define.html',
 	$latte->renderToString($template)
 );
diff --git a/tests/Latte/BlockMacros.define2.phpt → tests/tags/define2.phpt b/tests/Latte/BlockMacros.define2.phpt → tests/tags/define2.phpt
diff --git a/tests/Latte/CoreMacros.do.phpt → tests/tags/do.phpt b/tests/Latte/CoreMacros.do.phpt → tests/tags/do.phpt
diff --git a/tests/Latte/BlockMacros.embed.block.phpt → tests/tags/embed.block.phpt b/tests/Latte/BlockMacros.embed.block.phpt → tests/tags/embed.block.phpt
@@ -365,6 +365,6 @@ $latte->setLoader(new Latte\Loaders\StringLoader([
 ]));
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.embed.block.phtml',
+	__DIR__ . '/expected/embed.block.phtml',
 	$latte->compile('main')
 );
diff --git a/tests/Latte/BlockMacros.embed.file.phpt → tests/tags/embed.file.phpt b/tests/Latte/BlockMacros.embed.file.phpt → tests/tags/embed.file.phpt
@@ -739,6 +739,6 @@ $latte->setLoader(new Latte\Loaders\StringLoader([
 ]));
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.embed.file.phtml',
+	__DIR__ . '/expected/embed.file.phtml',
 	$latte->compile('main')
 );
diff --git a/...te/expected/BlockMacros.dynamicblock.html → tests/tags/expected/block.dynamic.html b/...te/expected/BlockMacros.dynamicblock.html → tests/tags/expected/block.dynamic.html
diff --git a/...e/expected/BlockMacros.dynamicblock.phtml → tests/tags/expected/block.dynamic.phtml b/...e/expected/BlockMacros.dynamicblock.phtml → tests/tags/expected/block.dynamic.phtml
diff --git a/...e/expected/BlockMacros.local.dynamic.html → tests/tags/expected/block.local.dynamic.html b/...e/expected/BlockMacros.local.dynamic.html → tests/tags/expected/block.local.dynamic.html
diff --git a/.../expected/BlockMacros.local.dynamic.phtml → ...s/tags/expected/block.local.dynamic.phtml b/.../expected/BlockMacros.local.dynamic.phtml → ...s/tags/expected/block.local.dynamic.phtml
diff --git a/...Latte/expected/BlockMacros.breaking.phtml → tests/tags/expected/breaking.phtml b/...Latte/expected/BlockMacros.breaking.phtml → tests/tags/expected/breaking.phtml
diff --git a/...te/expected/BlockMacros.define.args1.html → tests/tags/expected/define.args1.html b/...te/expected/BlockMacros.define.args1.html → tests/tags/expected/define.args1.html
diff --git a/...e/expected/BlockMacros.define.args1.phtml → tests/tags/expected/define.args1.phtml b/...e/expected/BlockMacros.define.args1.phtml → tests/tags/expected/define.args1.phtml
diff --git a/...te/expected/BlockMacros.define.args2.html → tests/tags/expected/define.args2.html b/...te/expected/BlockMacros.define.args2.html → tests/tags/expected/define.args2.html
diff --git a/...e/expected/BlockMacros.define.args2.phtml → tests/tags/expected/define.args2.phtml b/...e/expected/BlockMacros.define.args2.phtml → tests/tags/expected/define.args2.phtml
diff --git a/...e/expected/BlockMacros.define.args3.phtml → tests/tags/expected/define.args3.phtml b/...e/expected/BlockMacros.define.args3.phtml → tests/tags/expected/define.args3.phtml
diff --git a/...te/expected/BlockMacros.define.args4.html → tests/tags/expected/define.args4.html b/...te/expected/BlockMacros.define.args4.html → tests/tags/expected/define.args4.html
diff --git a/...e/expected/BlockMacros.define.args4.phtml → tests/tags/expected/define.args4.phtml b/...e/expected/BlockMacros.define.args4.phtml → tests/tags/expected/define.args4.phtml
diff --git a/...te/expected/BlockMacros.define.args5.html → tests/tags/expected/define.args5.html b/...te/expected/BlockMacros.define.args5.html → tests/tags/expected/define.args5.html
diff --git a/...e/expected/BlockMacros.define.args5.phtml → tests/tags/expected/define.args5.phtml b/...e/expected/BlockMacros.define.args5.phtml → tests/tags/expected/define.args5.phtml
diff --git a/tests/Latte/expected/BlockMacros.define.html → tests/tags/expected/define.html b/tests/Latte/expected/BlockMacros.define.html → tests/tags/expected/define.html
diff --git a/...s/Latte/expected/BlockMacros.define.phtml → tests/tags/expected/define.phtml b/...s/Latte/expected/BlockMacros.define.phtml → tests/tags/expected/define.phtml
diff --git a/...pected/BlockMacros.define.typehints.phtml → tests/tags/expected/define.typehints.phtml b/...pected/BlockMacros.define.typehints.phtml → tests/tags/expected/define.typehints.phtml
diff --git a/...te/expected/BlockMacros.embed.block.phtml → tests/tags/expected/embed.block.phtml b/...te/expected/BlockMacros.embed.block.phtml → tests/tags/expected/embed.block.phtml
diff --git a/...tte/expected/BlockMacros.embed.file.phtml → tests/tags/expected/embed.file.phtml b/...tte/expected/BlockMacros.embed.file.phtml → tests/tags/expected/embed.file.phtml
diff --git a/...e/expected/BlockMacros.extendsCheck.phtml → tests/tags/expected/extendsCheck.phtml b/...e/expected/BlockMacros.extendsCheck.phtml → tests/tags/expected/extendsCheck.phtml
diff --git a/...e/expected/CoreMacros.first-sep-last.html → tests/tags/expected/first-sep-last.html b/...e/expected/CoreMacros.first-sep-last.html → tests/tags/expected/first-sep-last.html
diff --git a/.../expected/CoreMacros.first-sep-last.phtml → tests/tags/expected/first-sep-last.phtml b/.../expected/CoreMacros.first-sep-last.phtml → tests/tags/expected/first-sep-last.phtml
diff --git a/tests/Latte/expected/CoreMacros.for.phtml → tests/tags/expected/for.phtml b/tests/Latte/expected/CoreMacros.for.phtml → tests/tags/expected/for.phtml
diff --git a/...ed/CoreMacros.foreach.breaking.attr.phtml → ...tags/expected/foreach.breaking.attr.phtml b/...ed/CoreMacros.foreach.breaking.attr.phtml → ...tags/expected/foreach.breaking.attr.phtml
diff --git a/...xpected/CoreMacros.foreach.breaking.phtml → tests/tags/expected/foreach.breaking.phtml b/...xpected/CoreMacros.foreach.breaking.phtml → tests/tags/expected/foreach.breaking.phtml
diff --git a/...te/expected/CoreMacros.foreach.else.phtml → tests/tags/expected/foreach.else.phtml b/...te/expected/CoreMacros.foreach.else.phtml → tests/tags/expected/foreach.else.phtml
diff --git a/.../Latte/expected/CoreMacros.foreach2.phtml → tests/tags/expected/foreach2.phtml b/.../Latte/expected/CoreMacros.foreach2.phtml → tests/tags/expected/foreach2.phtml
diff --git a/...s/Latte/expected/macros.general.html.html → tests/tags/expected/general.html.html b/...s/Latte/expected/macros.general.html.html → tests/tags/expected/general.html.html
diff --git a/.../Latte/expected/macros.general.html.phtml → tests/tags/expected/general.html.phtml b/.../Latte/expected/macros.general.html.phtml → tests/tags/expected/general.html.phtml
diff --git a/...s/Latte/expected/macros.n-attributes.html → ...s/tags/expected/general.n-attributes.html b/...s/Latte/expected/macros.n-attributes.html → ...s/tags/expected/general.n-attributes.html
diff --git a/.../Latte/expected/macros.n-attributes.phtml → .../tags/expected/general.n-attributes.phtml b/.../Latte/expected/macros.n-attributes.phtml → .../tags/expected/general.n-attributes.phtml
diff --git a/.../Latte/expected/macros.general.xhtml.html → tests/tags/expected/general.xhtml.html b/.../Latte/expected/macros.general.xhtml.html → tests/tags/expected/general.xhtml.html
diff --git a/...Latte/expected/macros.general.xhtml.phtml → tests/tags/expected/general.xhtml.phtml b/...Latte/expected/macros.general.xhtml.phtml → tests/tags/expected/general.xhtml.phtml
diff --git a/tests/Latte/expected/CoreMacros.if2.phtml → tests/tags/expected/if2.phtml b/tests/Latte/expected/CoreMacros.if2.phtml → tests/tags/expected/if2.phtml
diff --git a/...Latte/expected/CoreMacros.ifchanged.phtml → tests/tags/expected/ifchanged.phtml b/...Latte/expected/CoreMacros.ifchanged.phtml → tests/tags/expected/ifchanged.phtml
diff --git a/...s/Latte/expected/BlockMacros.import.phtml → tests/tags/expected/import.phtml b/...s/Latte/expected/BlockMacros.import.phtml → tests/tags/expected/import.phtml
diff --git a/...cted/BlockMacros.include.block.from.phtml → tests/tags/expected/include.block.from.phtml b/...cted/BlockMacros.include.block.from.phtml → tests/tags/expected/include.block.from.phtml
diff --git a/...s/Latte/expected/BlockMacros.include.html → tests/tags/expected/include.html b/...s/Latte/expected/BlockMacros.include.html → tests/tags/expected/include.html
@@ -11,4 +11,4 @@
 pre
 </textarea>
 
-	Parent: BlockMacros.include.latte/include
+	Parent: include.latte/include
diff --git a/...e/expected/BlockMacros.include.inc1.phtml → tests/tags/expected/include.inc1.phtml b/...e/expected/BlockMacros.include.inc1.phtml → tests/tags/expected/include.inc1.phtml
diff --git a/...e/expected/BlockMacros.include.inc2.phtml → tests/tags/expected/include.inc2.phtml b/...e/expected/BlockMacros.include.inc2.phtml → tests/tags/expected/include.inc2.phtml
diff --git a/...e/expected/BlockMacros.include.inc3.phtml → tests/tags/expected/include.inc3.phtml b/...e/expected/BlockMacros.include.inc3.phtml → tests/tags/expected/include.inc3.phtml
diff --git a/.../Latte/expected/BlockMacros.include.phtml → tests/tags/expected/include.phtml b/.../Latte/expected/BlockMacros.include.phtml → tests/tags/expected/include.phtml
diff --git a/...cted/BlockMacros.include.with-blocks.html → tests/tags/expected/include.with-blocks.html b/...cted/BlockMacros.include.with-blocks.html → tests/tags/expected/include.with-blocks.html
diff --git a/...BlockMacros.include.with-blocks.inc.phtml → ...gs/expected/include.with-blocks.inc.phtml b/...BlockMacros.include.with-blocks.inc.phtml → ...gs/expected/include.with-blocks.inc.phtml
diff --git a/...ted/BlockMacros.include.with-blocks.phtml → ...s/tags/expected/include.with-blocks.phtml b/...ted/BlockMacros.include.with-blocks.phtml → ...s/tags/expected/include.with-blocks.phtml
diff --git a/...te/expected/BlockMacros.includeblock.html → tests/tags/expected/includeblock.html b/...te/expected/BlockMacros.includeblock.html → tests/tags/expected/includeblock.html
diff --git a/...pected/BlockMacros.includeblock.inc.phtml → tests/tags/expected/includeblock.inc.phtml b/...pected/BlockMacros.includeblock.inc.phtml → tests/tags/expected/includeblock.inc.phtml
diff --git a/...e/expected/BlockMacros.includeblock.phtml → tests/tags/expected/includeblock.phtml b/...e/expected/BlockMacros.includeblock.phtml → tests/tags/expected/includeblock.phtml
diff --git a/...ected/BlockMacros.inheritance.child1.html → tests/tags/expected/inheritance.1.html b/...ected/BlockMacros.inheritance.child1.html → tests/tags/expected/inheritance.1.html
diff --git a/...ockMacros.inheritance.child1.parent.phtml → .../tags/expected/inheritance.1.parent.phtml b/...ockMacros.inheritance.child1.parent.phtml → .../tags/expected/inheritance.1.parent.phtml
diff --git a/...cted/BlockMacros.inheritance.child1.phtml → tests/tags/expected/inheritance.1.phtml b/...cted/BlockMacros.inheritance.child1.phtml → tests/tags/expected/inheritance.1.phtml
diff --git a/...ected/BlockMacros.inheritance.child2.html → tests/tags/expected/inheritance.2.html b/...ected/BlockMacros.inheritance.child2.html → tests/tags/expected/inheritance.2.html
diff --git a/...cted/BlockMacros.inheritance.child2.phtml → tests/tags/expected/inheritance.2.phtml b/...cted/BlockMacros.inheritance.child2.phtml → tests/tags/expected/inheritance.2.phtml
diff --git a/...ected/BlockMacros.inheritance.child5.html → tests/tags/expected/inheritance.5.html b/...ected/BlockMacros.inheritance.child5.html → tests/tags/expected/inheritance.5.html
diff --git a/...cted/BlockMacros.inheritance.child5.phtml → tests/tags/expected/inheritance.5.phtml b/...cted/BlockMacros.inheritance.child5.phtml → tests/tags/expected/inheritance.5.phtml
diff --git a/...cted/BlockMacros.inheritance.child6.phtml → tests/tags/expected/inheritance.6.phtml b/...cted/BlockMacros.inheritance.child6.phtml → tests/tags/expected/inheritance.6.phtml
diff --git a/...tte/expected/CoreMacros.iterateWhile.html → tests/tags/expected/iterateWhile.html b/...tte/expected/CoreMacros.iterateWhile.html → tests/tags/expected/iterateWhile.html
diff --git a/...te/expected/CoreMacros.iterateWhile.phtml → tests/tags/expected/iterateWhile.phtml b/...te/expected/CoreMacros.iterateWhile.phtml → tests/tags/expected/iterateWhile.phtml
diff --git a/.../expected/BlockMacros.snippet.block.phtml → tests/tags/expected/snippet.block.phtml b/.../expected/BlockMacros.snippet.block.phtml → tests/tags/expected/snippet.block.phtml
diff --git a/...ted/BlockMacros.snippet.dynamic.alt.phtml → ...s/tags/expected/snippet.dynamic.alt.phtml b/...ted/BlockMacros.snippet.dynamic.alt.phtml → ...s/tags/expected/snippet.dynamic.alt.phtml
diff --git a/...xpected/BlockMacros.snippet.dynamic.phtml → tests/tags/expected/snippet.dynamic.phtml b/...xpected/BlockMacros.snippet.dynamic.phtml → tests/tags/expected/snippet.dynamic.phtml
diff --git a/...pected/BlockMacros.snippet.dynamic2.phtml → tests/tags/expected/snippet.dynamic2.phtml b/...pected/BlockMacros.snippet.dynamic2.phtml → tests/tags/expected/snippet.dynamic2.phtml
diff --git a/...atte/expected/BlockMacros.snippet.n.phtml → tests/tags/expected/snippet.n.phtml b/...atte/expected/BlockMacros.snippet.n.phtml → tests/tags/expected/snippet.n.phtml
diff --git a/.../Latte/expected/BlockMacros.snippet.phtml → tests/tags/expected/snippet.phtml b/.../Latte/expected/BlockMacros.snippet.phtml → tests/tags/expected/snippet.phtml
diff --git a/tests/Latte/expected/CoreMacros.switch.phtml → tests/tags/expected/switch.phtml b/tests/Latte/expected/CoreMacros.switch.phtml → tests/tags/expected/switch.phtml
diff --git a/tests/Latte/expected/CoreMacros.syntax.html → tests/tags/expected/syntax.html b/tests/Latte/expected/CoreMacros.syntax.html → tests/tags/expected/syntax.html
diff --git a/tests/Latte/expected/CoreMacros.syntax.phtml → tests/tags/expected/syntax.phtml b/tests/Latte/expected/CoreMacros.syntax.phtml → tests/tags/expected/syntax.phtml
diff --git a/tests/Latte/expected/CoreMacros.try.phtml → tests/tags/expected/try.phtml b/tests/Latte/expected/CoreMacros.try.phtml → tests/tags/expected/try.phtml
diff --git a/tests/Latte/expected/CoreMacros.use.html → tests/tags/expected/use.html b/tests/Latte/expected/CoreMacros.use.html → tests/tags/expected/use.html
diff --git a/tests/Latte/expected/CoreMacros.use.phtml → tests/tags/expected/use.phtml b/tests/Latte/expected/CoreMacros.use.phtml → tests/tags/expected/use.phtml
diff --git a/tests/Latte/expected/BlockMacros.vars.html → tests/tags/expected/vars.html b/tests/Latte/expected/BlockMacros.vars.html → tests/tags/expected/vars.html
diff --git a/tests/Latte/expected/BlockMacros.vars.phtml → tests/tags/expected/vars.phtml b/tests/Latte/expected/BlockMacros.vars.phtml → tests/tags/expected/vars.phtml
diff --git a/tests/Latte/expected/CoreMacros.while.phtml → tests/tags/expected/while.phtml b/tests/Latte/expected/CoreMacros.while.phtml → tests/tags/expected/while.phtml
diff --git a/tests/Latte/BlockMacros.extendsCheck.phpt → tests/tags/extendsCheck.phpt b/tests/Latte/BlockMacros.extendsCheck.phpt → tests/tags/extendsCheck.phpt
@@ -23,6 +23,6 @@ content
 ';
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.extendsCheck.phtml',
+	__DIR__ . '/expected/extendsCheck.phtml',
 	$latte->compile($template)
 );
diff --git a/tests/Latte/CoreMacros.first-sep-last.phpt → tests/tags/first-sep-last.phpt b/tests/Latte/CoreMacros.first-sep-last.phpt → tests/tags/first-sep-last.phpt
@@ -44,10 +44,10 @@ $template = <<<'EOD'
 EOD;
 
 Assert::matchFile(
-	__DIR__ . '/expected/CoreMacros.first-sep-last.phtml',
+	__DIR__ . '/expected/first-sep-last.phtml',
 	$latte->compile($template)
 );
 Assert::matchFile(
-	__DIR__ . '/expected/CoreMacros.first-sep-last.html',
+	__DIR__ . '/expected/first-sep-last.html',
 	$latte->renderToString($template, ['people' => ['John', 'Mary', 'Paul']])
 );
diff --git a/tests/Latte/CoreMacros.for.phpt → tests/tags/for.phpt b/tests/Latte/CoreMacros.for.phpt → tests/tags/for.phpt
@@ -31,6 +31,6 @@ $template = <<<'EOD'
 EOD;
 
 Assert::matchFile(
-	__DIR__ . '/expected/CoreMacros.for.phtml',
+	__DIR__ . '/expected/for.phtml',
 	$latte->compile($template)
 );
diff --git a/tests/Latte/CoreMacros.foreach.breaking.phpt → tests/tags/foreach.breaking.phpt b/tests/Latte/CoreMacros.foreach.breaking.phpt → tests/tags/foreach.breaking.phpt
@@ -53,7 +53,7 @@ $template = <<<'EOD'
 EOD;
 
 Assert::matchFile(
-	__DIR__ . '/expected/CoreMacros.foreach.breaking.phtml',
+	__DIR__ . '/expected/foreach.breaking.phtml',
 	$latte->compile($template)
 );
 
@@ -105,7 +105,7 @@ $template = <<<'EOD'
 EOD;
 
 Assert::matchFile(
-	__DIR__ . '/expected/CoreMacros.foreach.breaking.attr.phtml',
+	__DIR__ . '/expected/foreach.breaking.attr.phtml',
 	$latte->compile($template)
 );
 

diff --git a/tests/Latte/CoreMacros.foreach.else.phpt → tests/tags/foreach.else.phpt b/tests/Latte/CoreMacros.foreach.else.phpt → tests/tags/foreach.else.phpt
@@ -17,7 +17,7 @@ $latte->setLoader(new Latte\Loaders\StringLoader);
 
 
 Assert::matchFile(
-	__DIR__ . '/expected/CoreMacros.foreach.else.phtml',
+	__DIR__ . '/expected/foreach.else.phtml',
 	$latte->compile('
 {foreach [a] as $item}
 	item

diff --git a/tests/Latte/CoreMacros.foreach.parent.phpt → tests/tags/foreach.parent.phpt b/tests/Latte/CoreMacros.foreach.parent.phpt → tests/tags/foreach.parent.phpt
diff --git a/tests/Latte/CoreMacros.foreach.phpt → tests/tags/foreach.phpt b/tests/Latte/CoreMacros.foreach.phpt → tests/tags/foreach.phpt
diff --git a/tests/Latte/CoreMacros.foreach2.phpt → tests/tags/foreach2.phpt b/tests/Latte/CoreMacros.foreach2.phpt → tests/tags/foreach2.phpt
@@ -31,7 +31,7 @@ $template = <<<'EOD'
 EOD;
 
 Assert::matchFile(
-	__DIR__ . '/expected/CoreMacros.foreach2.phtml',
+	__DIR__ . '/expected/foreach2.phtml',
 	$latte->compile($template)
 );
 

diff --git a/tests/Latte/macros.general.html.phpt → tests/tags/general.html.phpt b/tests/Latte/macros.general.html.phpt → tests/tags/general.html.phpt
@@ -26,11 +26,11 @@ $params['el'] = new Html("<div title='1/2\"'></div>");
 $params['el2'] = Nette\Utils\Html::el('span', ['title' => '/"'])->setText('foo');
 
 Assert::matchFile(
-	__DIR__ . '/expected/macros.general.html.phtml',
+	__DIR__ . '/expected/general.html.phtml',
 	$latte->compile(__DIR__ . '/templates/general.latte')
 );
 Assert::matchFile(
-	__DIR__ . '/expected/macros.general.html.html',
+	__DIR__ . '/expected/general.html.html',
 	$latte->renderToString(
 		__DIR__ . '/templates/general.latte',
 		$params

diff --git a/tests/Latte/macros.n-attributes.phpt → tests/tags/general.n-attributes.phpt b/tests/Latte/macros.n-attributes.phpt → tests/tags/general.n-attributes.phpt
@@ -17,11 +17,11 @@ $latte = new Latte\Engine;
 $params['people'] = ['John', 'Mary', 'Paul'];
 
 Assert::matchFile(
-	__DIR__ . '/expected/macros.n-attributes.phtml',
+	__DIR__ . '/expected/general.n-attributes.phtml',
 	$latte->compile(__DIR__ . '/templates/n-attributes.latte')
 );
 Assert::matchFile(
-	__DIR__ . '/expected/macros.n-attributes.html',
+	__DIR__ . '/expected/general.n-attributes.html',
 	$latte->renderToString(
 		__DIR__ . '/templates/n-attributes.latte',
 		$params

diff --git a/tests/Latte/macros.general.xhtml.phpt → tests/tags/general.xhtml.phpt b/tests/Latte/macros.general.xhtml.phpt → tests/tags/general.xhtml.phpt
@@ -27,11 +27,11 @@ $params['el'] = new Html("<div title='1/2\"'></div>");
 $params['el2'] = Nette\Utils\Html::el('span', ['title' => '/"'])->setText('foo');
 
 Assert::matchFile(
-	__DIR__ . '/expected/macros.general.xhtml.phtml',
+	__DIR__ . '/expected/general.xhtml.phtml',
 	$latte->compile(__DIR__ . '/templates/general.latte')
 );
 Assert::matchFile(
-	__DIR__ . '/expected/macros.general.xhtml.html',
+	__DIR__ . '/expected/general.xhtml.html',
 	$latte->renderToString(
 		__DIR__ . '/templates/general.latte',
 		$params

diff --git a/tests/Latte/CoreMacros.if.phpt → tests/tags/if.phpt b/tests/Latte/CoreMacros.if.phpt → tests/tags/if.phpt
diff --git a/tests/Latte/CoreMacros.if2.phpt → tests/tags/if2.phpt b/tests/Latte/CoreMacros.if2.phpt → tests/tags/if2.phpt
@@ -56,7 +56,7 @@ $template = <<<'EOD'
 EOD;
 
 Assert::matchFile(
-	__DIR__ . '/expected/CoreMacros.if2.phtml',
+	__DIR__ . '/expected/if2.phtml',
 	$latte->compile($template)
 );
 

diff --git a/tests/Latte/CoreMacros.ifchanged.phpt → tests/tags/ifchanged.phpt b/tests/Latte/CoreMacros.ifchanged.phpt → tests/tags/ifchanged.phpt
@@ -42,7 +42,7 @@ $template = <<<'EOD'
 EOD;
 
 Assert::matchFile(
-	__DIR__ . '/expected/CoreMacros.ifchanged.phtml',
+	__DIR__ . '/expected/ifchanged.phtml',
 	$latte->compile($template)
 );
 

diff --git a/tests/Latte/BlockMacros.ifset.block.phpt → tests/tags/ifset.block.phpt b/tests/Latte/BlockMacros.ifset.block.phpt → tests/tags/ifset.block.phpt
diff --git a/tests/Latte/BlockMacros.import.extends.phpt → tests/tags/import.extends.phpt b/tests/Latte/BlockMacros.import.extends.phpt → tests/tags/import.extends.phpt
diff --git a/tests/Latte/BlockMacros.import.extends2.phpt → tests/tags/import.extends2.phpt b/tests/Latte/BlockMacros.import.extends2.phpt → tests/tags/import.extends2.phpt
diff --git a/tests/Latte/BlockMacros.import.phpt → tests/tags/import.phpt b/tests/Latte/BlockMacros.import.phpt → tests/tags/import.phpt
@@ -31,7 +31,7 @@ $latte->setLoader(new Latte\Loaders\StringLoader([
 ]));
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.import.phtml',
+	__DIR__ . '/expected/import.phtml',
 	$latte->compile('main')
 );
 Assert::match(

diff --git a/tests/Latte/CoreMacros.include.phpt → tests/tags/include.2.phpt b/tests/Latte/CoreMacros.include.phpt → tests/tags/include.2.phpt
diff --git a/...Latte/BlockMacros.include.block.from.phpt → tests/tags/include.block.from.phpt b/...Latte/BlockMacros.include.block.from.phpt → tests/tags/include.block.from.phpt
@@ -55,6 +55,6 @@ Assert::error(function () use ($latte) {
 }, PHP_VERSION_ID < 80000 ? E_NOTICE : E_WARNING, 'Undefined variable%a%');
 
 Assert::matchFile(
-	__DIR__ . '/expected/BlockMacros.include.block.from.phtml',
+	__DIR__ . '/expected/include.block.from.phtml',
 	$latte->compile('main5')
 );
diff --git a/tests/Latte/BlockMacros.include.block.phpt → tests/tags/include.block.phpt b/tests/Latte/BlockMacros.include.block.phpt → tests/tags/include.block.phpt
diff --git a/tests/Latte/BlockMacros.include.parent.phpt → tests/tags/include.parent.phpt b/tests/Latte/BlockMacros.include.parent.phpt → tests/tags/include.parent.phpt