[cnn] Modernize test definitions