Minor NN test changes