Fix phpcs errors in tests dir

Change-Id: I79fa3b8f92e958f4a0dc4fe892703f37d711ca95
Merge "Fix phpcs errors in tests dir"