Very minor spec tidy ups

Used `subject` where possible.
Slight naming fixes.
Removed unnecessary `subject` from nested contexts.