Formatting is hard lol
Refactor tests