Tweak variable names.
Clean up NNLS test cases.