reorganize tests in the build file

Change-Id: I3bea85d1dbdcf4492afc641abb79e0222f7fe4d9
1 file changed