Fix Test View

Fix test view not ordering the results and failing randomly

Change-Id: I45d2df7cbbc821b56b9d7eb7abb62f7ad98a3977