Merge pull request #60 from tkrille/adding_tests

Adding tests