FIX: Another try to fix the system test