Another attempt to fix tests