- simplifies template loader
- adds some more tests