some bs to fix discrepancies between tests and real-life
Merge pull request #815 from mjallday/master

some bs to fix discrepancies between tests and real-life