- aaand: another feeble attempt to fix my fix for the tests