Added unit tests for the template engine and removed unnecessary TODO marks