Get trainer test working again.