Model train/test fixed for AGJ