Merge "Added transcoding tests"