Fix make test and run it in travis.

With this change, 'make test' works again. It's still really basic, but it's a start.