Re: minor test stuff