Merge pull request #4 from strobelm/chameleon

update tests and change templates to chameleon