Added unit tests
Merge pull request #4 from Stolz/develop

Added unit tests