Change IncrementForFieldValues to use collections, add tests