Fixed older tests