Minor tweaks
test fix
Merge pull request #214 from seedpod/organic-minor-amends

Organic minor amends