Refactored unit tests to render corrent template