Fix spec and cleanup context