More small testing changes.