{% block %} tag and tests. Some small bugfixes.