Changed spec for the context and fixed others