Merge "A couple small test improvements" into feature/zuulv3