Changes to encoder test based on last commit