Renamed definitions to templates. Added iso support
Add tests
More test cleanup