Adding strict test
Test and working template type conversion
Cleaning up tests
All passing