Minor update for better testabilities