Several tweaks that don't break tests :P
More tweaks
Using helper fn