Move balance-logic to model and fix tests