Fix unit test ordering

Change-Id: Ic6f5d4621b4ca9544a10ccf9f9d3542181fda5b4