Task #32 - type template testing continued (fixing more bugs)