New attempt to fix tests