7.0 fix travis

Make travis Happy!
When reviewing, pay attention that a lot of code has been changed and everything is not covered by tests.