d8a60e5e6c
A test refactor was a little incomplete, causing errors to be thrown during the test run. This patch fixes the test helper causing the issues, and corrects the ordering of some of the message arguments. Change-Id: I4dc992f1bd1f7b074519987e211a761b6575f8d9 Closes-Bug: 1522814