Make sure sub_score_mat does not try and do diag() on a sparse matrix
Fix conversion of ff/bigmatrix to matrix in sparse matrix generation
Fix test of sparse matrices to deal with fact that diagonal is now inc.