fixed template, fixed unit-tests