Updates structure and adds test
Merge pull request #3 from krisrybak/tests

Updates structure and adds test