Multiple updates related to testing