:fix: bugs on context and :add: context UTs