fix tests

* stuff that broke due to content changes
* stuff that broke due to changes in income/outgoings logic
* fix bad logic in test for callback times