Modified training and test data selection so it contains same type of data, but different measures for now..