[TASK] Refactor and cover Condition / Context scope with tests