Test + formatting tweaks