[WIP] Fixing formatting and adding unit tests.
[WIP] Fixing formatting and adding unit tests.

Signed-off-by: Clément Padovani <c9bf3357043571604918b9570f09f422d79a1a16@users.noreply.github.com>

markohlebar/Peckham