added a few tests
many more tests
fix tests
fix travis
Merge pull request #7 from RJFryman/tests

Tests