make unit-test templates more sense