Fixing NN tests, DRY