Last fixes so that precision and recall on test is more accurate