fix tests, cc&travis
up