Finish NMF test and implementation