Improve software test_change_group test.

Change-Id: I17b5cb6e1d37d09c9f894eb31e4858be481dd234