Fix gluon tests related to CNNArch2Gluon!83 and cnnarch2x!53. Both merge requests must be merged first.