[WIP] Refactor
[WIP] Tabulize tests