Modest test improvements.