Fixed tests
Fixed templates.