Added missing tests + reordered Travis config