Merge "Add missing test files to compile."