Improved unit test
Small template fix