Fix unit tests after commit 11aad6bd4975848e1306984c962ed910b1589e9b broke them