fix tests
enable travis
merge