Fixed tests and added travis