Fix genesis test.
Refactor/cleaning.
Whisper test fix.