Merge pull request #5 from marineam/tests

Fix tests, setup for Tavis