Fix a few differences observed during the comparison of fast chain test with CA-based and old style config. Some more differences still to be understood.
@jchapman, @golling, @lmijovic