Fix logic error in intestacy flow.

Also fixed intentation in test (hence the noisy diff, sorry...)