Merge "Refactor DecoderTest" into jb-mr2-dev