Reverted attempt to fix tests