Fix spec and cleanup context

One quick fix.