[fix] Test and fixes.