Fix spec and cleanup context

Fixes one failing spec and adds the remaining 2.