Six circular imports
Change calculations on payouts
Start adapting payout tests