fixed test failiurs