Minor updates to tests