Adding functionality to support being sourced, and an extra test