Fixed failig tests