Remove 'needs-rebalancing' and add 'count-happiness' to checker reports

Remove 'needs-rebalancing' and add 'count-happiness' to checker reports; repair tests.
fixes #1784, #2105

Signed-off-by: Daira Hopwood <daira@jacaranda.org>