check_individual: some fixes; add tests