Fixing JST templates + previous test