fix some test cases about add/remove control