fix for base context extensions + extra tests