Fixing tests take two.