Removed references to nrmllib
Fixed a test