add tests
done
Merge branch 't4_template_context'