Fix Unpassed Testest