reorder factor_cov_matrix args to match convention, add remaining tests, completes fixes for issue