review test again part-two

Change-Id: I7e96478c9bfb3fcff4c26efa671a49b7d3e367b4