Tests added (including some fixes for tag rendering process)