travis fix and added more tests