Fixing test build problems.