Fixed up test suite, and added Travis-CI