Updated CSV files and added more Unit Tests.