Merge pull request #23 from HN23/tests

Tests