Fixed travis and existing tests