Add more tests for gh-43
Fix travis build script