Re-order tests
Updating mobile UT