Cleanup in SetStatementRankTest

Change-Id: I6fa46aab1c22231c2f2a6a7044113184594019a3
Merge "Cleanup in SetStatementRankTest"