Fix tests for basic encoding