Fixed tests including reported test for ngm_825