fixing tests and travis build