yet another attempt to fix tests