Add tests
Merge pull request #2 from rootzid/development

Add tests