Some test improvements