Fix scope change calculation (add a check on board_id)
Fix unit test