Merge "Refactor Hadamard tests and add highbd tests"