fixed various junit tests and added the data files