Fix, Tests: fix template, update test