s: Refactor tests
s: WIP snapshot