Fix the way we separate training and testing data a little bit