Add trading between farmers and woodcutters

Added setup for farmers and traders
These two groups will trade automatically
Fix broken tests