Fix CodeSniffer errors and warnings in changes tests

Follow-up to 1c6b7c74859e7.

Change-Id: Ib42621a03a43487d94ff1cb755544823a8adda9c
Merge "Fix CodeSniffer errors and warnings in changes tests"