Made pattern test more strict
Added templates for all original tests in .log files