comments #7 - income tests

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'income' into develop