Fix unit tests
Update travis matrix