added travis + fix tests