Task #32 - type template testing WIP (a lot of fixes)