Fix genesis test.
Refactor/cleaning.