Revert "very desparate attempt to fix tests"

This reverts commit 6c40c4617385dca03c79728240ea164d7ea73d09.