Store the machines count in the bundle extra info.

This test exercises the number of units, machinesCount has its own test below, and I'd prefer to keep tests separate, for future sanity ;-)