More testing changes.