Tweak to fix tests.