RTF-724

* minor fixes on some unit tests
* create block on some templates