EOD - analyes template and fix tests