Very minor spec tidy ups

Used `subject` where possible.
Slight naming fixes.
Removed unnecessary `subject` from nested contexts.
Reverted changes to the explicit `subject`.
Merge pull request #242 from benlovell/spec-tidy-ups

Very minor spec tidy ups