Merge "Add a branch to ensure the test is compiled."