Fix test suite & travis integration