[fix] Fixing some tests