Fix the build by making more things syncForTest :(