Made tests faster / be friends with Travis