Added tests for existing functionality
Merge pull request #25 from makyo/1-2-3-4-tests

Added tests for existing functionality

Ignore the '4' in the branch name