Working on context wrappers and tests