Another bunch of updates to tests