Fixed tests after recent changes to context core api