Fixed tests & CS.