Make FakeConverter more realistic

Spotted by Aude in I38298ceb.

Change-Id: I5c5605770077752cd189a5a5f1233949e6eec1d8
Merge "Make FakeConverter more realistic"