Adding Csv Object and Better tests