Fixing bugs in new ERB templates for test suite. TRAD-36