Adding new tests for existing code.
Merge pull request #18 from begizi/adding_tests

Adding new tests for existing code.