touched up two older tests