Reworked nn1-implementation. Added testset-handling