Tidy alignment of test data

Change-Id: I6cf01b4fdc93b1e2f8aadff8df231c766f71de7d