very desparate attempt to fix tests