tests fixed, travis file fixed