FIX: Fix Travis tests