Make tests more realistic

Change-Id: I6cdcf7d03b9a74bbcc1f1d684b966176623190d3