Changing interfaces for testing
Adding tests
Merge pull request #3 from jex/initial

Added Tests