Adding tests!
Fixing issue with template nullifying