Fix you win
Fixed tests