Merge "reorganize tests in the build file"