ticket 14: finished tests prettified templates