Bring in testing changes