Completed refactoring and problem identification for the NNL.Test
package