Adding better tests and updating CSV.