Merge "Update codec name in test enviroment to match decoder" into nextgenv2