ticket:5 some tests refactored; template mess fixed after previous commits