Merge pull request #12 from brint/master

adding initial tests