latest testing changes and such