Some small testing changes?