Resolve some formatting issues in tests

Change-Id: I5efb420c277df639ca4ea3ccbb7eaaeedcc354a3