Improvements to StatementTest

Change-Id: Ibd71dc39fcb097bfc8ca1f6462e7fff5ca27e2be
Merge "Improvements to StatementTest"