Added junit, refacted data file reading