FIX unit tests and TravisCI