Fix test suits