Merge "Clean test/dct_test.cc with testing::Combine"