Merge pull request #1 from sumpygump/add-tests

Add tests