Revisited the specs and tightened them
Merge pull request #12 from ministryofjustice/spec-tweaks

Revisited the specs and tightened them - merged