Merge "Rework unit test for 8x8 transformation"