Fixed older tests.