Some test improvements.