Unit Test Improvement

Changed the order of one test so that
it will run on team city.

Change-Id: Ia013d16105559cdb2e06fd419960b3fa54caa91f