Reorganized test routine for neural net