Fixed tests following update to individual.

defindividual has changed return type to something more sensible.
And :types was renamed to :type to be consistent.