VirtualTable - fix Encoder & tests according review comments