upd: added short/long template option
upd: added some tests