Fixed failing context tests