some bs to fix discrepancies between tests and real-life

Ewwww.

Follow on from #813