Added some test functionality
Merge branch 'master' of github.com:alephobjects/ezd