Fix merge conflict between D5369 and D5365

Summary:
One added a new test, the other changed the format of the tests,
so a test failed. Now it passes.

Test Plan: arc unit

Reviewers: epriestley, vrana, wez

Reviewed By: vrana

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D5459