Changes to older tests