Added unit and CS tests